[hornetq-commits] JBoss hornetq SVN: r9797 - in branches/hornetq-416/src/main/org/hornetq: jms/client and 1 other directories.

[do-not-reply at jboss.org]

Author: gaohoward
Date: 2010-10-19 23:05:39 -0400 (Tue, 19 Oct 2010)
New Revision: 9797

Modified:
   branches/hornetq-416/src/main/org/hornetq/api/jms/management/JMSServerControl.java
   branches/hornetq-416/src/main/org/hornetq/jms/client/HornetQConnection.java
   branches/hornetq-416/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java
Log:
add meta data to every session, not depending on initial session


Modified: branches/hornetq-416/src/main/org/hornetq/api/jms/management/JMSServerControl.java
===================================================================
--- branches/hornetq-416/src/main/org/hornetq/api/jms/management/JMSServerControl.java	2010-10-19 23:58:09 UTC (rev 9796)
+++ branches/hornetq-416/src/main/org/hornetq/api/jms/management/JMSServerControl.java	2010-10-20 03:05:39 UTC (rev 9797)
@@ -251,6 +251,4 @@
     */
    @Operation(desc = "List all JMS consumers associated to a JMS Connection")
    String listConsumersAsJSON(@Parameter(desc = "a connection ID", name = "connectionID") String connectionID) throws Exception;
-
-
 }

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-19 23:58:09 UTC (rev 9796)
+++ branches/hornetq-416/src/main/org/hornetq/jms/client/HornetQConnection.java	2010-10-20 03:05:39 UTC (rev 9797)
@@ -183,11 +183,11 @@
       this.clientID = clientID;
       try
       {
-         initialSession.addMetaData("jms-client-id", clientID);
+         this.addSessionMetaData(initialSession);
       }
       catch (HornetQException e)
       {
-         JMSException ex = new JMSException("Internal erro setting metadata jms-client-id");
+         JMSException ex = new JMSException("Internal error setting metadata jms-client-id");
          ex.setLinkedException(e);
          throw ex;
       }
@@ -547,6 +547,8 @@
          {
             session.start();
          }
+         
+         this.addSessionMetaData(session);
 
          return jbs;
       }
@@ -571,13 +573,9 @@
       try
       {
          initialSession = sessionFactory.createSession(username, password, false, false, false, false, 0);
-         //mark it is a jms initial session
-         initialSession.addMetaData("jms-initial-session", "");
-         if (clientID != null)
-         {
-            initialSession.addMetaData("jms-client-id", clientID);
-         }
 
+         addSessionMetaData(initialSession);
+
          initialSession.addFailureListener(listener);
       }
       catch (HornetQException me)
@@ -586,6 +584,14 @@
       }
    }
 
+   private void addSessionMetaData(ClientSession session) throws HornetQException
+   {
+      if (clientID != null)
+      {
+         session.addMetaData("jms-client-id", clientID);
+      }
+   }
+
    // Inner classes --------------------------------------------------------------------------------
 
    private static class JMSFailureListener implements SessionFailureListener

Modified: branches/hornetq-416/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java
===================================================================
--- branches/hornetq-416/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java	2010-10-19 23:58:09 UTC (rev 9796)
+++ branches/hornetq-416/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java	2010-10-20 03:05:39 UTC (rev 9797)
@@ -740,13 +740,13 @@
 
          Set<ServerSession> sessions = server.getHornetQServer().getSessions();
          
-         Map<Object, ServerSession> initialSessions = new HashMap<Object, ServerSession>();
+         Map<Object, ServerSession> jmsSessions = new HashMap<Object, ServerSession>();
 
          for (ServerSession session : sessions)
          {
-            if (session.getMetaData("jms-initial-session") != null)
+            if (session.getMetaData("jms-client-id") != null)
             {
-               initialSessions.put(session.getConnectionID(), session);
+               jmsSessions.put(session.getConnectionID(), session);
             }
          }
 
@@ -756,8 +756,8 @@
             obj.put("connectionID", connection.getID().toString());
             obj.put("clientAddress", connection.getRemoteAddress());
             obj.put("creationTime", connection.getCreationTime());
-            obj.put("clientID", initialSessions.get(connection.getID()).getMetaData("jms-client-id"));
-            obj.put("principal", initialSessions.get(connection.getID()).getUsername());
+            obj.put("clientID", jmsSessions.get(connection.getID()).getMetaData("jms-client-id"));
+            obj.put("principal", jmsSessions.get(connection.getID()).getUsername());
             array.put(obj);
          }
          return array.toString();