svn commit: r991006 - /qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py

[kg...@apache.org]

Author: kgiusti
Date: Mon Aug 30 22:12:57 2010
New Revision: 991006

URL: http://svn.apache.org/viewvc?rev=991006&view=rev
Log:
QMF: do not add wildcards to the agent filter list.

Modified:
    qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py

Modified: qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py?rev=991006&r1=991005&r2=991006&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py (original)
+++ qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py Mon Aug 30 22:12:57 2010
@@ -762,12 +762,22 @@ class Session:
     """
     if not self.userBindings:
       raise Exception("Session not configured for binding specific agents.")
-    self.agent_filter.append((vendor, product, instance))
     if product is not None:
       v2key = "agent.ind.heartbeat.%s.%s.#" % (vendor.replace(".", "_"), product.replace(".", "_"))
     else:
       v2key = "agent.ind.heartbeat.%s.#" % vendor.replace(".", "_")
     self.v2BindingKeyList.append(v2key)
+
+    # allow wildcards - only add filter if a non-wildcarded component is given
+    if vendor == "*":
+      vendor = None
+    if product == "*":
+      product = None
+    if instance == "*":
+      instance = None
+    if vendor or product or instance:
+      self.agent_filter.append((vendor, product, instance))
+
     for broker in self.brokers:
       if broker.isConnected():
         if broker.brokerSupportsV2:



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