summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java11
1 files changed, 5 insertions, 6 deletions
diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
index dcf8d1fd47..34cbd90b8c 100644
--- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
@@ -1110,14 +1110,13 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
_clientVersion = _clientProperties.getString(ConnectionStartProperties.VERSION_0_8);
- if (_clientProperties.getString(ConnectionStartProperties.CLIENT_ID_0_8) != null)
+ String clientId = _clientProperties.getString(ConnectionStartProperties.CLIENT_ID_0_8);
+ if (clientId != null)
{
- String clientID = _clientProperties.getString(ConnectionStartProperties.CLIENT_ID_0_8);
- setContextKey(new AMQShortString(clientID));
-
- // Log the Opening of the connection for this client
- _actor.message(ConnectionMessages.OPEN(clientID, _protocolVersion.toString(), _clientVersion, true, true, true));
+ setContextKey(new AMQShortString(clientId));
}
+
+ _actor.message(ConnectionMessages.OPEN(clientId, _protocolVersion.toString(), _clientVersion, true, true, true));
}
}