You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ra...@apache.org on 2009/10/20 11:23:55 UTC

svn commit: r827013 - in /activemq/branches/activemq-5.3: ./ activemq-console/src/main/java/org/apache/activemq/console/command/BstatCommand.java activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java

Author: rajdavies
Date: Tue Oct 20 09:23:53 2009
New Revision: 827013

URL: http://svn.apache.org/viewvc?rev=827013&view=rev
Log:
Merged /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java:r825009-825083 for https://issues.apache.org/activemq/browse/AMQ-2447

Modified:
    activemq/branches/activemq-5.3/   (props changed)
    activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/BstatCommand.java
    activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java   (props changed)

Propchange: activemq/branches/activemq-5.3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 20 09:23:53 2009
@@ -1 +1 @@
-/activemq/trunk:816278-816279,816298,818138,818140-818147,818155,818160-818176,818209,818211,818224-818262,818480,818484,818487,818496,818502,818504-818510,818513-818516,818609,818635,818724-818762,818888,818905,818914,818923,818947-818955,818985,820031,820713-820714,820764,821090,821103,821115,824807,825084
+/activemq/trunk:816278-816279,816298,818138,818140-818147,818155,818160-818176,818209,818211,818224-818262,818480,818484,818487,818496,818502,818504-818510,818513-818516,818609,818635,818724-818762,818888,818905,818914,818923,818947-818955,818985,820031,820713-820714,820764,821090,821103,821115,824807,825009-825084

Modified: activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/BstatCommand.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/BstatCommand.java?rev=827013&r1=827012&r2=827013&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/BstatCommand.java (original)
+++ activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/BstatCommand.java Tue Oct 20 09:23:53 2009
@@ -73,4 +73,11 @@
         super.runTask(queryTokens);
     }
 
+    /**
+     * Print the help messages for the browse command
+     */
+    protected void printHelp() {
+        context.printHelp(helpFile);
+    }
+
 }

Propchange: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 20 09:23:53 2009
@@ -1 +1 @@
-/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java:502054-818935,818937-819035,820031,820713-820714,820764,821090,821103,821115,825084
+/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java:502054-818935,818937-819035,820031,820713-820714,820764,821090,821103,821115,825009-825084