From do-not-reply at jboss.org Fri Oct 15 07:38:18 2010
Content-Type: multipart/mixed; boundary="===============3959038025840744828=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: hornetq-commits at lists.jboss.org
Subject: [hornetq-commits] JBoss hornetq SVN: r9790 - in
 branches/hornetq-416/src/main/org/hornetq: core/protocol/core/impl/wireformat
 and 1 other directories.
Date: Fri, 15 Oct 2010 07:38:17 -0400
Message-ID: <201010151138.o9FBcHNP031523@svn01.web.mwc.hst.phx2.redhat.com>

--===============3959038025840744828==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

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/ServerSessi=
onPacketHandler.java
   branches/hornetq-416/src/main/org/hornetq/core/protocol/core/impl/wirefo=
rmat/SessionAddMetaDataMessage.java
   branches/hornetq-416/src/main/org/hornetq/jms/client/HornetQConnection.j=
ava
Log:
clientID added


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

Modified: branches/hornetq-416/src/main/org/hornetq/core/protocol/core/impl=
/wireformat/SessionAddMetaDataMessage.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/hornetq-416/src/main/org/hornetq/core/protocol/core/impl/wiref=
ormat/SessionAddMetaDataMessage.java	2010-10-15 03:55:57 UTC (rev 9789)
+++ branches/hornetq-416/src/main/org/hornetq/core/protocol/core/impl/wiref=
ormat/SessionAddMetaDataMessage.java	2010-10-15 11:38:17 UTC (rev 9790)
@@ -19,7 +19,7 @@
 /**
  * A SessionAddMetaDataMessage
  *
- * @author howard
+ * @author <a href=3D"mailto:hgao(a)redhat.com>Howard Gao</a>
  *
  *
  */
@@ -54,6 +54,12 @@
       data =3D buffer.readString();
    }
 =

+   @Override
+   public final boolean isRequiresConfirmations()
+   {
+      return false;
+   }
+
    public String getKey()
    {
       return key;

Modified: branches/hornetq-416/src/main/org/hornetq/jms/client/HornetQConne=
ction.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 =3D sessionFactory.createSession(username, passwor=
d, false, false, false, false, 0);
          //mark it is a jms initial session
          initialSession.addMetaData("jms-initial-session", "");
-         initialSession.addMetaData("jms-username", username);
+         if (clientID !=3D null)
+         {
+            initialSession.addMetaData("jms-client-id", clientID);
+         }
 =

          initialSession.addFailureListener(listener);
       }


--===============3959038025840744828==--