QPID-4756: enable updateStats callback for QMFv2 object notifications

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1469974 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 6 deletions

diff --git a/extras/qmf/src/py/qmf/console.py b/extras/qmf/src/py/qmf/console.py
index bd30730617..2d80bd26d2 100644
--- a/extras/qmf/src/py/qmf/console.py
+++ b/extras/qmf/src/py/qmf/console.py
@@ -3101,15 +3101,17 @@ class Agent:
     if 'qmf_object' in kwargs:
       if self.session.console:
         obj = kwargs['qmf_object']
-        if len(self.session.class_filter) == 0:
-          self.session.console.objectProps(self.broker, obj)
-        elif obj.getClassKey():
+        if self.session.class_filter and obj.getClassKey():
           # slow path: check classKey against event_filter
           pname = obj.getClassKey().getPackageName()
           cname = obj.getClassKey().getClassName()
-          if ((pname, cname) in self.session.class_filter
-              or (pname, None) in self.session.class_filter):
-            self.session.console.objectProps(self.broker, obj)
+          if ((pname, cname) not in self.session.class_filter
+              and (pname, None) not in self.session.class_filter):
+              return
+        self.session.console.objectProps(self.broker, obj)
+        if obj.getStatistics():
+            # QMFv2 objects may also contain statistic updates
+            self.session.console.objectStats(self.broker, obj)
     elif 'qmf_object_stats' in kwargs:
       if self.session.console:
         obj = kwargs['qmf_object_stats']