[hornetq-commits] JBoss hornetq SVN: r9790 - in branches/hornetq-416/src/main/org/hornetq: core/protocol/core/impl/wireformat and 1 other directories.

[do-not-reply at jboss.org]

Author: gaohoward
Date: 2010-10-15 07:38:17 -0400 (Fri, 15 Oct 2010)
New Revision: 9790

Modified:
   branches/hornetq-416/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java
   branches/hornetq-416/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java
   branches/hornetq-416/src/main/org/hornetq/jms/client/HornetQConnection.java
Log:
clientID added


Modified: branches/hornetq-416/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java
===================================================================
--- branches/hornetq-416/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java	2010-10-15 03:55:57 UTC (rev 9789)
+++ branches/hornetq-416/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java	2010-10-15 11:38:17 UTC (rev 9790)
@@ -463,6 +463,7 @@
                }
                case PacketImpl.SESS_ADD_METADATA:
                {
+                  response = new NullResponseMessage();
                   SessionAddMetaDataMessage message = (SessionAddMetaDataMessage)packet;
                   session.addMetaData(message.getKey(), message.getData());
                   break;

Modified: branches/hornetq-416/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java
===================================================================
--- branches/hornetq-416/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java	2010-10-15 03:55:57 UTC (rev 9789)
+++ branches/hornetq-416/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java	2010-10-15 11:38:17 UTC (rev 9790)
@@ -19,7 +19,7 @@
 /**
  * A SessionAddMetaDataMessage
  *
- * @author howard
+ * @author <a href="mailto:hgao at redhat.com>Howard Gao</a>
  *
  *
  */
@@ -54,6 +54,12 @@
       data = buffer.readString();
    }
 
+   @Override
+   public final boolean isRequiresConfirmations()
+   {
+      return false;
+   }
+
    public String getKey()
    {
       return key;

Modified: branches/hornetq-416/src/main/org/hornetq/jms/client/HornetQConnection.java
===================================================================
--- branches/hornetq-416/src/main/org/hornetq/jms/client/HornetQConnection.java	2010-10-15 03:55:57 UTC (rev 9789)
+++ branches/hornetq-416/src/main/org/hornetq/jms/client/HornetQConnection.java	2010-10-15 11:38:17 UTC (rev 9790)
@@ -573,7 +573,10 @@
          initialSession = sessionFactory.createSession(username, password, false, false, false, false, 0);
          //mark it is a jms initial session
          initialSession.addMetaData("jms-initial-session", "");
-         initialSession.addMetaData("jms-username", username);
+         if (clientID != null)
+         {
+            initialSession.addMetaData("jms-client-id", clientID);
+         }
 
          initialSession.addFailureListener(listener);
       }