From 5d41efce6a605d61c55f4f2bf1b5ee1611522bcb Mon Sep 17 00:00:00 2001 From: Robert Davies Date: Mon, 25 Jun 2007 10:55:11 +0000 Subject: [PATCH] apply patch http://issues.apache.org/activemq/browse/AMQ-1293 git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@550450 13f79535-47bb-0310-9956-ffa450edef68 --- .../console/command/ShutdownCommand.java | 2 +- .../WildcardToMsgSelectorTransformFilter.java | 1 - .../filter/WildcardToRegExTransformFilter.java | 1 - .../activemq/console/util/JmxMBeansUtil.java | 16 ++++++++-------- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/ShutdownCommand.java b/activemq-console/src/main/java/org/apache/activemq/console/command/ShutdownCommand.java index ab6cd05f08..4f236c479d 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/command/ShutdownCommand.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/command/ShutdownCommand.java @@ -109,7 +109,7 @@ public class ShutdownCommand extends AbstractJmxCommand { GlobalWriter.print("Stopping broker: " + brokerName); try { - server.invoke(brokerObjName, "terminateJVM", new Object[] {new Integer(0)}, new String[] {"int"}); + server.invoke(brokerObjName, "terminateJVM", new Object[] {Integer.valueOf(0)}, new String[] {"int"}); GlobalWriter.print("Succesfully stopped broker: " + brokerName); } catch (Exception e) { // TODO: Check exceptions throwned diff --git a/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToMsgSelectorTransformFilter.java b/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToMsgSelectorTransformFilter.java index 1ed4e2a72c..abe0d29c33 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToMsgSelectorTransformFilter.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToMsgSelectorTransformFilter.java @@ -39,7 +39,6 @@ public class WildcardToMsgSelectorTransformFilter extends WildcardTransformFilte int pos = key.indexOf("="); if (pos >= 0) { val = key.substring(pos + 1); - key = key.substring(0, pos); } // If the value contains wildcards and is enclose by ' diff --git a/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToRegExTransformFilter.java b/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToRegExTransformFilter.java index a583d511bf..f2b2938d22 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToRegExTransformFilter.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToRegExTransformFilter.java @@ -39,7 +39,6 @@ public class WildcardToRegExTransformFilter extends WildcardTransformFilter { int pos = key.indexOf("="); if (pos >= 0) { val = key.substring(pos + 1); - key = key.substring(0, pos); } // If the value contains wildcards diff --git a/activemq-console/src/main/java/org/apache/activemq/console/util/JmxMBeansUtil.java b/activemq-console/src/main/java/org/apache/activemq/console/util/JmxMBeansUtil.java index bd3002683f..ce90aaa9af 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/util/JmxMBeansUtil.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/util/JmxMBeansUtil.java @@ -81,15 +81,15 @@ public class JmxMBeansUtil { return query.replaceAll("%1", param); } - public static String createQueryString(String query, List params) { + public static String createQueryString(String query, List params) { + String output = query; + int count = 1; + for (Iterator i = params.iterator(); i.hasNext();) { + output = output.replaceAll("%" + count++, i.next().toString()); + } - int count = 1; - for (Iterator i=params.iterator();i.hasNext();) { - query.replaceAll("%" + count++, i.next().toString()); - } - - return query; - } + return output; + } public static QueryFilter createMBeansObjectNameQuery(JMXServiceURL jmxUrl) { return new WildcardToRegExTransformFilter( // Let us be able to accept wildcard queries