You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2011/08/18 12:41:12 UTC
svn commit: r1159149 -
/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
Author: gtully
Date: Thu Aug 18 10:41:12 2011
New Revision: 1159149
URL: http://svn.apache.org/viewvc?rev=1159149&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3459 - fix up outofdate merge
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java?rev=1159149&r1=1159148&r2=1159149&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java Thu Aug 18 10:41:12 2011
@@ -197,7 +197,7 @@ public class ManagedRegionBroker extends
info.setSubscriptionName(sub.getConsumerInfo().getSubscriptionName());
info.setDestination(sub.getConsumerInfo().getDestination());
info.setSelector(sub.getSelector());
- addInactiveSubscription(key, info);
+ addInactiveSubscription(key, info, sub);
} else {
if (sub.getConsumerInfo().isDurable()) {
view = new DurableSubscriptionView(this, context.getClientId(), sub);
@@ -484,7 +484,7 @@ public class ManagedRegionBroker extends
info.setSubscriptionName(subscriptionKey.getSubscriptionName());
info.setDestination(new ActiveMQTopic(view.getDestinationName()));
info.setSelector(view.getSelector());
- addInactiveSubscription(subscriptionKey, info);
+ addInactiveSubscription(subscriptionKey, info, (brokerService.isKeepDurableSubsActive() ? view.subscription : null));
}
}
}