You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2011/06/23 17:24:14 UTC
svn commit: r1138925 -
/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
Author: dejanb
Date: Thu Jun 23 15:24:14 2011
New Revision: 1138925
URL: http://svn.apache.org/viewvc?rev=1138925&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3362 - check expired messages only for inactive durable subs
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java?rev=1138925&r1=1138924&r2=1138925&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java Thu Jun 23 15:24:14 2011
@@ -539,8 +539,10 @@ public class Topic extends BaseDestinati
topicStore.recover(new MessageRecoveryListener() {
public boolean recoverMessage(Message message) throws Exception {
if (message.isExpired()) {
- for (Subscription sub : durableSubcribers.values()) {
- messageExpired(connectionContext, sub, message);
+ for (DurableTopicSubscription sub : durableSubcribers.values()) {
+ if (!sub.isActive()) {
+ messageExpired(connectionContext, sub, message);
+ }
}
}
result.add(message);