Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 68361 invoked from network); 16 Nov 2006 21:08:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Nov 2006 21:08:27 -0000 Received: (qmail 44854 invoked by uid 500); 16 Nov 2006 21:08:38 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 44838 invoked by uid 500); 16 Nov 2006 21:08:38 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 44829 invoked by uid 99); 16 Nov 2006 21:08:38 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Nov 2006 13:08:37 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Nov 2006 13:08:27 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 8F2251A9846; Thu, 16 Nov 2006 13:07:55 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r475929 - /incubator/activemq/branches/activemq-4.1/activemq-console/src/main/java/org/apache/activemq/console/command/QueryCommand.java Date: Thu, 16 Nov 2006 21:07:55 -0000 To: activemq-commits@geronimo.apache.org From: aco@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061116210755.8F2251A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: aco Date: Thu Nov 16 13:07:54 2006 New Revision: 475929 URL: http://svn.apache.org/viewvc?view=rev&rev=475929 Log: https://issues.apache.org/activemq/browse/AMQ-1050 Backported fix to query command to 4.1 branch Modified: incubator/activemq/branches/activemq-4.1/activemq-console/src/main/java/org/apache/activemq/console/command/QueryCommand.java Modified: incubator/activemq/branches/activemq-4.1/activemq-console/src/main/java/org/apache/activemq/console/command/QueryCommand.java URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-console/src/main/java/org/apache/activemq/console/command/QueryCommand.java?view=diff&rev=475929&r1=475928&r2=475929 ============================================================================== --- incubator/activemq/branches/activemq-4.1/activemq-console/src/main/java/org/apache/activemq/console/command/QueryCommand.java (original) +++ incubator/activemq/branches/activemq-4.1/activemq-console/src/main/java/org/apache/activemq/console/command/QueryCommand.java Thu Nov 16 13:07:54 2006 @@ -94,7 +94,10 @@ return; } String queryStr = JmxMBeansUtil.createQueryString(predefQuery, value); - queryAddObjects.add(queryStr); + StringTokenizer queryTokens = new StringTokenizer(queryStr, COMMAND_OPTION_DELIMETER); + while (queryTokens.hasMoreTokens()) { + queryAddObjects.add(queryTokens.nextToken()); + } } // If token is a substractive predefined query define option @@ -114,7 +117,10 @@ return; } String queryStr = JmxMBeansUtil.createQueryString(predefQuery, value); - querySubObjects.add(queryStr); + StringTokenizer queryTokens = new StringTokenizer(queryStr, COMMAND_OPTION_DELIMETER); + while (queryTokens.hasMoreTokens()) { + querySubObjects.add(queryTokens.nextToken()); + } } // If token is an additive object name query option