activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rajdav...@apache.org
Subject svn commit: r550450 - in /activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console: command/ShutdownCommand.java filter/WildcardToMsgSelectorTransformFilter.java filter/WildcardToRegExTransformFilter.java util/JmxMBeansUtil.java
Date Mon, 25 Jun 2007 10:55:15 GMT
Author: rajdavies
Date: Mon Jun 25 03:55:11 2007
New Revision: 550450

URL: http://svn.apache.org/viewvc?view=rev&rev=550450
Log:
apply patch http://issues.apache.org/activemq/browse/AMQ-1293

Modified:
    activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/ShutdownCommand.java
    activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToMsgSelectorTransformFilter.java
    activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToRegExTransformFilter.java
    activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/util/JmxMBeansUtil.java

Modified: activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/ShutdownCommand.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/ShutdownCommand.java?view=diff&rev=550450&r1=550449&r2=550450
==============================================================================
--- activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/ShutdownCommand.java
(original)
+++ activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/ShutdownCommand.java
Mon Jun 25 03:55:11 2007
@@ -109,7 +109,7 @@
             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

Modified: activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToMsgSelectorTransformFilter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToMsgSelectorTransformFilter.java?view=diff&rev=550450&r1=550449&r2=550450
==============================================================================
--- activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToMsgSelectorTransformFilter.java
(original)
+++ activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToMsgSelectorTransformFilter.java
Mon Jun 25 03:55:11 2007
@@ -39,7 +39,6 @@
         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 '

Modified: activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToRegExTransformFilter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToRegExTransformFilter.java?view=diff&rev=550450&r1=550449&r2=550450
==============================================================================
--- activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToRegExTransformFilter.java
(original)
+++ activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToRegExTransformFilter.java
Mon Jun 25 03:55:11 2007
@@ -39,7 +39,6 @@
         int pos = key.indexOf("=");
         if (pos >= 0) {
             val = key.substring(pos + 1);
-            key = key.substring(0, pos);
         }
 
         // If the value contains wildcards

Modified: activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/util/JmxMBeansUtil.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/util/JmxMBeansUtil.java?view=diff&rev=550450&r1=550449&r2=550450
==============================================================================
--- activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/util/JmxMBeansUtil.java
(original)
+++ activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/util/JmxMBeansUtil.java
Mon Jun 25 03:55:11 2007
@@ -81,15 +81,15 @@
         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



Mime
View raw message