You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2013/04/26 22:06:03 UTC
svn commit: r1476373 - in /qpid/trunk/qpid:
cpp/src/tests/qpidd_qmfv2_tests.py extras/qmf/src/py/qmf/console.py
Author: kgiusti
Date: Fri Apr 26 20:06:03 2013
New Revision: 1476373
URL: http://svn.apache.org/r1476373
Log:
QPID-4756: only invoke property update callback if properties are present
Modified:
qpid/trunk/qpid/cpp/src/tests/qpidd_qmfv2_tests.py
qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py
Modified: qpid/trunk/qpid/cpp/src/tests/qpidd_qmfv2_tests.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/qpidd_qmfv2_tests.py?rev=1476373&r1=1476372&r2=1476373&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/qpidd_qmfv2_tests.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/qpidd_qmfv2_tests.py Fri Apr 26 20:06:03 2013
@@ -111,6 +111,7 @@ class ConsoleTest(BrokerTest):
self.events.append(event)
def objectProps(self, broker, record):
#print "ObjProps %s" % record
+ assert len(record.getProperties()), "objectProps() invoked with no properties?"
oid = record.getObjectId()
if oid not in self.updates:
self.updates[oid] = record
@@ -118,6 +119,7 @@ class ConsoleTest(BrokerTest):
self.updates[oid].mergeUpdate( record )
def objectStats(self, broker, record):
#print "ObjStats %s" % record
+ assert len(record.getStatistics()), "objectStats() invoked with no properties?"
oid = record.getObjectId()
if oid not in self.updates:
self.updates[oid] = record
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=1476373&r1=1476372&r2=1476373&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py (original)
+++ qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py Fri Apr 26 20:06:03 2013
@@ -3108,7 +3108,8 @@ class Agent:
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.getProperties():
+ self.session.console.objectProps(self.broker, obj)
if obj.getStatistics():
# QMFv2 objects may also contain statistic updates
self.session.console.objectStats(self.broker, obj)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org