Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-3459 - fix up outofdate merge 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1159149 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2011-08-18 10:41:12 +00:00
parent 12aeb272bd
commit e23b8ea0a6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
View File

@ -197,7 +197,7 @@ public class ManagedRegionBroker extends RegionBroker {
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 RegionBroker {
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));
}
}
}