[rhmessaging-commits] rhmessaging commits: r2003 - mgmt/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2008-05-07 11:41:15 -0400 (Wed, 07 May 2008)
New Revision: 2003

Modified:
   mgmt/cumin/python/cumin/model.py
Log:
Can't test this yet due to broker conditions, but this change makes
session protection non-broken at a minimum.



Modified: mgmt/cumin/python/cumin/model.py
===================================================================
--- mgmt/cumin/python/cumin/model.py	2008-05-06 19:39:27 UTC (rev 2002)
+++ mgmt/cumin/python/cumin/model.py	2008-05-07 15:41:15 UTC (rev 2003)
@@ -863,7 +863,8 @@
             return "Close"
 
         def do_invoke(self, client, args, completion):
-            conn = self.cumin_model.data.getConnectionByObject(client)
+            reg = client.vhost.broker.registration
+            conn = self.cumin_model.data.getConnectionByRegistration(reg)
 
             # Does it contain a mgmt session?
 
@@ -914,8 +915,16 @@
             return "Close"
 
         def do_invoke(self, object, args, completion):
-            conn = self.cumin_model.data.getConnectionByObject(object)
+            reg = object.client.vhost.broker.registration
+            conn = self.cumin_model.data.getConnectionByRegistration(reg)
 
+            print "curr session, conn session", object.name, conn.getSessionId()
+
+            for c in self.cumin_model.data.connections:
+                print "conn", self.cumin_model.data.connections[c].getSessionId()
+
+            return
+
             if object.name == conn.getSessionId():
                 raise Exception \
                     ("Cannot close management session %s" % object.name)
@@ -927,7 +936,8 @@
             return "Detach"
 
         def do_invoke(self, object, args, completion):
-            conn = self.cumin_model.data.getConnectionByObject(object)
+            reg = object.client.vhost.broker.registration
+            conn = self.cumin_model.data.getConnectionByRegistration(reg)
 
             if object.name == conn.getSessionId():
                 raise Exception \