svn commit: r928097 - /qpid/branches/qmf-devel0.7a/qpid/extras/qmf/src/py/qmf/console.py

[tr...@apache.org]

Author: tross
Date: Fri Mar 26 23:18:59 2010
New Revision: 928097

URL: http://svn.apache.org/viewvc?rev=928097&view=rev
Log:
Fixed a bug preventing reception of unsolicited messages from the broker.

Modified:
    qpid/branches/qmf-devel0.7a/qpid/extras/qmf/src/py/qmf/console.py

Modified: qpid/branches/qmf-devel0.7a/qpid/extras/qmf/src/py/qmf/console.py
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/extras/qmf/src/py/qmf/console.py?rev=928097&r1=928096&r2=928097&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/extras/qmf/src/py/qmf/console.py (original)
+++ qpid/branches/qmf-devel0.7a/qpid/extras/qmf/src/py/qmf/console.py Fri Mar 26 23:18:59 2010
@@ -2086,7 +2086,7 @@ class Broker:
         if len(items) >= 4:
           if items[0] == 'console' and items[3].isdigit():
             agent_addr = int(items[3]) # The QMFv1 Agent Bank
-    if agent_addr and agent_addr in self.agents:
+    if agent_addr != None and agent_addr in self.agents:
       agent = self.agents[agent_addr]
 
     codec = Codec(msg.body)
@@ -2394,13 +2394,11 @@ class Agent:
         self.console.methodResponse(broker, seq, result)
 
 
-  def _v1HandleEventInd(self, broker, codec, seq):
+  def _v1HandleEventInd(self, codec, seq):
     """
     Handle a QMFv1 event indication
     """
-    if self.console != None:
-      event = Event(self, broker, codec)
-      self.console.event(broker, event)
+    pass
 
 
   def _v1HandleContentInd(self, codec, sequence, prop=False, stat=False):
@@ -2416,6 +2414,7 @@ class Agent:
     if classKey.getPackageName() == "org.apache.qpid.broker" and classKey.getClassName() == "agent" and prop:
       self.broker._updateAgent(obj)
 
+    context = self.unsolicitedContext
     try:
       self.lock.acquire()
       if sequence in self.contextMap:
@@ -2423,8 +2422,6 @@ class Agent:
     finally:
       self.lock.release()
 
-    if not context:
-      context = self.unsolicitedContext
     context.addV1QueryResult(obj)
 
 
@@ -2596,7 +2593,7 @@ class RequestContext(object):
 
   def addV1QueryResult(self, data):
     if self.notifiable:
-      self.notifyable(qmf_object=data)
+      self.notifiable(qmf_object=data)
     else:
       self.queryResults.append(data)
 



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org