You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2013/10/27 18:08:52 UTC

svn commit: r1536162 - /qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java

Author: robbie
Date: Sun Oct 27 17:08:52 2013
New Revision: 1536162

URL: http://svn.apache.org/r1536162
Log:
QPID-5265: always log the client version, and log clientid even if null since that in itself is useful to know.

Modified:
    qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java?rev=1536162&r1=1536161&r2=1536162&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java Sun Oct 27 17:08:52 2013
@@ -1110,14 +1110,13 @@ public class AMQProtocolEngine implement
 
             _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));
         }
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org