1 files changed, 6 insertions, 4 deletions
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java b/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
index 2b7c3f2664..d9c259c389 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
@@ -329,7 +329,11 @@ public class JMXTestUtils
     public boolean isManagedObjectExist(String query)
     {
         return !queryObjects(query).isEmpty();
+    }
 
+    public int getNumberOfObjects(String query)
+    {
+        return queryObjects(query).size();
     }
 
     public <T> T getManagedObject(Class<T> managedClass, ObjectName objectName)
@@ -430,8 +434,7 @@ public class JMXTestUtils
     }
 
     /**
-     * Returns the Set of ObjectNames returned by the broker for the given query,
-     * or null if there is problem while performing the query.
+     * Returns the Set of ObjectNames returned by the broker for the given query.
      */
     private Set<ObjectName> queryObjects(String query)
     {
@@ -441,8 +444,7 @@ public class JMXTestUtils
         }
         catch (Exception e)
         {
-            e.printStackTrace();
-            return null;
+            throw new RuntimeException("Error using query: " + query, e);
         }
     }
 }