From 5e90f00e8d04eec611c23ca1c07b75936f7da5af Mon Sep 17 00:00:00 2001
From: Gary Tully <gtully@apache.org>
Date: Mon, 20 Jul 2009 09:59:03 +0000
Subject: [PATCH] defer task start till cursor is started -
 https://issues.apache.org/activemq/browse/AMQ-1112

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@795733 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/activemq/broker/region/Queue.java     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
index d579519957..20afa8a97f 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
@@ -186,10 +186,6 @@ public class Queue extends BaseDestination implements Task, UsageListener {
             this.taskRunner = new DeterministicTaskRunner(this.executor,this);
         }
         
-        if (getExpireMessagesPeriod() > 0) {
-            scheduler.schedualPeriodically(expireMessagesTask, getExpireMessagesPeriod());
-        }
-        
         super.initialize();
         if (store != null) {
             // Restore the persistent messages.
@@ -631,6 +627,9 @@ public class Queue extends BaseDestination implements Task, UsageListener {
         }
         systemUsage.getMemoryUsage().addUsageListener(this);
         messages.start();
+        if (getExpireMessagesPeriod() > 0) {
+            scheduler.schedualPeriodically(expireMessagesTask, getExpireMessagesPeriod());
+        }
         doPageIn(false);
     }
 
@@ -642,7 +641,6 @@ public class Queue extends BaseDestination implements Task, UsageListener {
             this.executor.shutdownNow();
         }
         
-        LOG.info(toString() + ", canceling expireMessagesTask");
         scheduler.cancel(expireMessagesTask);
         
         if (messages != null) {