From e23b8ea0a63db1fd5cacf0b23ca1d53393b4bf38 Mon Sep 17 00:00:00 2001 From: Gary Tully Date: Thu, 18 Aug 2011 10:41:12 +0000 Subject: [PATCH] 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 --- .../org/apache/activemq/broker/jmx/ManagedRegionBroker.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java index 657f9f78c6..4c9f92a995 100755 --- a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java @@ -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)); } } }