summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2013-10-27 17:08:52 +0000
committerRobert Gemmell <robbie@apache.org>2013-10-27 17:08:52 +0000
commit4c02e95c7f4f4cb4206b4c013a0dbbd7f1d80b93 (patch)
tree9713a11305fa64261c084a431c46ec1a8056fed5 /java
parent7a6d3353a0e0ed574813f3591efeb1790ee12f2e (diff)
downloadqpid-python-4c02e95c7f4f4cb4206b4c013a0dbbd7f1d80b93.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/qpid@1536162 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--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/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
index dcf8d1fd47..34cbd90b8c 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
+++ b/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));
}
}