activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1159090 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx: InactiveDurableSubscriptionView.java ManagedRegionBroker.java
Date Thu, 18 Aug 2011 08:46:58 GMT
Author: dejanb
Date: Thu Aug 18 08:46:58 2011
New Revision: 1159090

URL: http://svn.apache.org/viewvc?rev=1159090&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3459 - inactive durable subscriber view selector

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/InactiveDurableSubscriptionView.java
    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/InactiveDurableSubscriptionView.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/InactiveDurableSubscriptionView.java?rev=1159090&r1=1159089&r2=1159090&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/InactiveDurableSubscriptionView.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/InactiveDurableSubscriptionView.java
Thu Aug 18 08:46:58 2011
@@ -139,4 +139,9 @@ public class InactiveDurableSubscription
     public String toString() {
         return "InactiveDurableSubscriptionView: " + getClientId() + ":" + getSubscriptionName();
     }
+
+    @Override
+    public String getSelector() {
+        return subscriptionInfo.getSelector();
+    }
 }

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=1159090&r1=1159089&r2=1159090&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 08:46:58 2011
@@ -196,7 +196,8 @@ public class ManagedRegionBroker extends
                 info.setClientId(context.getClientId());
                 info.setSubscriptionName(sub.getConsumerInfo().getSubscriptionName());
                 info.setDestination(sub.getConsumerInfo().getDestination());
-                addInactiveSubscription(key, info, sub);
+                info.setSelector(sub.getSelector());
+                addInactiveSubscription(key, info);
             } else {
                 if (sub.getConsumerInfo().isDurable()) {
                     view = new DurableSubscriptionView(this, context.getClientId(), sub);
@@ -482,7 +483,8 @@ public class ManagedRegionBroker extends
                 info.setClientId(subscriptionKey.getClientId());
                 info.setSubscriptionName(subscriptionKey.getSubscriptionName());
                 info.setDestination(new ActiveMQTopic(view.getDestinationName()));
-                addInactiveSubscription(subscriptionKey, info, (brokerService.isKeepDurableSubsActive()
? view.subscription : null));
+                info.setSelector(view.getSelector());
+                addInactiveSubscription(subscriptionKey, info);
             }
         }
     }



Mime
View raw message