[rhmessaging-commits] rhmessaging commits: r4260 - mgmt/newdata/cumin/python/cumin/messaging.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2010-09-07 18:27:32 -0400 (Tue, 07 Sep 2010)
New Revision: 4260

Modified:
   mgmt/newdata/cumin/python/cumin/messaging/connection.py
Log:
Fix for BZ 630853. Now using app.session.qmf_brokers

Modified: mgmt/newdata/cumin/python/cumin/messaging/connection.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/messaging/connection.py	2010-09-07 20:40:00 UTC (rev 4259)
+++ mgmt/newdata/cumin/python/cumin/messaging/connection.py	2010-09-07 22:27:32 UTC (rev 4260)
@@ -40,15 +40,15 @@
     def do_invoke(self, invoc, conn):
         # XXX generalize this check and use it for other closes
 
-        session_ids = set()
+        mgmt_conns = set()
 
-        for broker in self.app.model.mint.model.qmf_brokers:
-            session_ids.add(broker.getSessionId())
+        for broker in self.app.session.qmf_brokers:
+            # str(broker.conn) gets the broker.conn.sock host:port
+            mgmt_conns.add(str(broker.conn))
 
-        for sess in conn.sessions:
-            if sess.name in session_ids:
-                raise Exception \
-                    ("Cannot close management connection %s" % conn.address)
+        if conn.address in mgmt_conns:
+            raise Exception \
+                ("Cannot close management connection %s" % conn.address)
 
         self.qmf_call(invoc, conn, "close")
 
@@ -83,20 +83,22 @@
     def do_invoke(self, invoc, conn):
         # XXX generalize this check and use it for other closes
 
-        session_ids = set()
+        mgmt_conns = set()
 
-        for broker in self.app.model.mint.model.qmf_brokers:
-            session_ids.add(broker.getSessionId())
+        for broker in self.app.session.qmf_brokers:
+            # str(broker.conn) gets the broker.conn.sock host:port
+            mgmt_conns.add(str(broker.conn))
 
-        for sess in conn.sessions:
-            if sess.name in session_ids:
-                raise Exception \
-                    ("Cannot close management connection %s" % conn.address)
+        if conn.address in mgmt_conns:
+            raise Exception \
+                ("Cannot close management connection %s" % conn.address)
 
         self.qmf_call(invoc, conn, "close")
 
     def get_item_content(self, session, item):
         args = (item.remoteProcessName, item.remotePid)
+        if args[1] is None:
+            return item.address
         return "%s (%i)" % args
 
 class ConnectionProcessColumn(ObjectTableColumn):