You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2014/07/24 19:39:38 UTC
svn commit: r1613198 -
/qpid/trunk/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/QueueInformation.java
Author: kwall
Date: Thu Jul 24 17:39:38 2014
New Revision: 1613198
URL: http://svn.apache.org/r1613198
Log:
NO-JIRA: [Java Broker] update JMX QueueInformation example to use the necessary quoted elements in its ObjectNames
Modified:
qpid/trunk/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/QueueInformation.java
Modified: qpid/trunk/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/QueueInformation.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/QueueInformation.java?rev=1613198&r1=1613197&r2=1613198&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/QueueInformation.java (original)
+++ qpid/trunk/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/QueueInformation.java Thu Jul 24 17:39:38 2014
@@ -119,7 +119,7 @@ public class QueueInformation
_mbsc = con.getMBeanServerConnection();
- Set<ObjectName> names = _mbsc.queryNames(new ObjectName("org.apache.qpid:type=VirtualHost.Queue,VirtualHost=" + _vhost + ",*"), null);
+ Set<ObjectName> names = _mbsc.queryNames(new ObjectName("org.apache.qpid:type=VirtualHost.Queue,VirtualHost=" + ObjectName.quote(_vhost) + ",*"), null);
// Print header
if (names.size() > 0)
@@ -248,7 +248,7 @@ public class QueueInformation
private static void getDetails(boolean printRates) throws Exception
{
- for (ObjectName object : getMatchingObjects())
+ for (ObjectName object : getMatchingObjects(_queueNames))
{
try
{
@@ -334,27 +334,33 @@ public class QueueInformation
return con;
}
- public static ObjectName[] getMatchingObjects() throws IOException, MalformedObjectNameException
+ public static ObjectName[] getMatchingObjects(Set<String> queueNames) throws IOException, MalformedObjectNameException
{
+ Set<ObjectName> requestedObjects = new HashSet<>();
- // Gets all Queues names
- if (_queueNames == null)
+ if (queueNames == null)
{
- _queueNames = new HashSet<String>();
- _queueNames.add("*");
- }
-
- Set<ObjectName> requestedObjects = new HashSet<ObjectName>();
-
- for (String queue : _queueNames)
- {
- Set<ObjectName> matchingObjects = _mbsc.queryNames(new ObjectName("org.apache.qpid:type=VirtualHost.Queue,VirtualHost=" + _vhost + ",name=" + queue + ",*"), null);
+ // Gets all Queues names
+ Set<ObjectName> matchingObjects = _mbsc.queryNames(new ObjectName("org.apache.qpid:type=VirtualHost.Queue,VirtualHost=" + ObjectName.quote(_vhost) + ",name=*,*"), null);
if (!matchingObjects.isEmpty())
{
requestedObjects.addAll(matchingObjects);
}
}
+ else
+ {
+ for (String queue : queueNames)
+ {
+ Set<ObjectName> matchingObjects = _mbsc.queryNames(new ObjectName("org.apache.qpid:type=VirtualHost.Queue,VirtualHost=" + ObjectName.quote(_vhost) + ",name=" + ObjectName.quote(queue) + ",*"), null);
+
+ if (!matchingObjects.isEmpty())
+ {
+ requestedObjects.addAll(matchingObjects);
+ }
+ }
+
+ }
return requestedObjects.toArray(new ObjectName[requestedObjects.size()]);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org