From 16a1e2b6862e8da45ef3d711e46e46dd17f94efc Mon Sep 17 00:00:00 2001 From: Timothy Bish Date: Fri, 8 May 2015 13:45:21 -0400 Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-5768 Exclude advisory topics from the expired message check. --- .../src/main/java/org/apache/activemq/broker/region/Topic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b27fe68ae0..a0631258db 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()); } }