[hornetq-commits] JBoss hornetq SVN: r10077 - in trunk/src/main/org/hornetq: spi/core/protocol and 1 other directory.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2010-12-27 16:47:36 -0500 (Mon, 27 Dec 2010)
New Revision: 10077

Modified:
   trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java
   trunk/src/main/org/hornetq/spi/core/protocol/RemotingConnection.java
Log:
tweak

Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java	2010-12-27 21:27:30 UTC (rev 10076)
+++ trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java	2010-12-27 21:47:36 UTC (rev 10077)
@@ -551,13 +551,17 @@
 
          for (RemotingConnection connection : connections)
          {
-            JSONObject obj = new JSONObject();
-            obj.put("connectionID", connection.getID().toString());
-            obj.put("clientAddress", connection.getRemoteAddress());
-            obj.put("creationTime", connection.getCreationTime());
-            obj.put("clientID", jmsSessions.get(connection.getID()).getMetaData("jms-client-id"));
-            obj.put("principal", jmsSessions.get(connection.getID()).getUsername());
-            array.put(obj);
+            ServerSession session = jmsSessions.get(connection.getID());
+            if (session != null)
+            {
+               JSONObject obj = new JSONObject();
+               obj.put("connectionID", connection.getID().toString());
+               obj.put("clientAddress", connection.getRemoteAddress());
+               obj.put("creationTime", connection.getCreationTime());
+               obj.put("clientID", session.getMetaData("jms-client-id"));
+               obj.put("principal", session.getUsername());
+               array.put(obj);
+            }
          }
          return array.toString();
       }

Modified: trunk/src/main/org/hornetq/spi/core/protocol/RemotingConnection.java
===================================================================
--- trunk/src/main/org/hornetq/spi/core/protocol/RemotingConnection.java	2010-12-27 21:27:30 UTC (rev 10076)
+++ trunk/src/main/org/hornetq/spi/core/protocol/RemotingConnection.java	2010-12-27 21:47:36 UTC (rev 10077)
@@ -13,7 +13,6 @@
 
 package org.hornetq.spi.core.protocol;
 
-import java.util.Collection;
 import java.util.List;
 
 import org.hornetq.api.core.HornetQBuffer;