activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject [2/2] activemq git commit: https://issues.apache.org/jira/browse/AMQ-5768
Date Fri, 08 May 2015 18:41:46 GMT
https://issues.apache.org/jira/browse/AMQ-5768

Exclude advisory topics from the expired message check.  

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/16a1e2b6
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/16a1e2b6
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/16a1e2b6

Branch: refs/heads/master
Commit: 16a1e2b6862e8da45ef3d711e46e46dd17f94efc
Parents: a812131
Author: Timothy Bish <tabish121@gmail.com>
Authored: Fri May 8 13:45:21 2015 -0400
Committer: Timothy Bish <tabish121@gmail.com>
Committed: Fri May 8 13:45:21 2015 -0400

----------------------------------------------------------------------
 .../src/main/java/org/apache/activemq/broker/region/Topic.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/16a1e2b6/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
index b27fe68..a063125 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java
@@ -560,7 +560,7 @@ public class Topic extends BaseDestination implements Task {
             memoryUsage.start();
         }
 
-        if (getExpireMessagesPeriod() > 0) {
+        if (getExpireMessagesPeriod() > 0 && !AdvisorySupport.isAdvisoryTopic(getActiveMQDestination()))
{
             scheduler.executePeriodically(expireMessagesTask, getExpireMessagesPeriod());
         }
     }


Mime
View raw message