diff options
| author | Robert Gemmell <robbie@apache.org> | 2013-10-27 17:08:52 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2013-10-27 17:08:52 +0000 |
| commit | 76666e50981b92b60197d9a51c7fff62e38fb98e (patch) | |
| tree | 0dbcfdcf90867a839211475d057edce7ca3266ac | |
| parent | 67d7f2e7951a804766a878267b37d38d0e83dc4c (diff) | |
| download | qpid-python-76666e50981b92b60197d9a51c7fff62e38fb98e.tar.gz | |
QPID-5265: always log the client version, and log clientid even if null since that in itself is useful to know.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1536162 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java | 11 |
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)); } } |