From 9f7fff73652871d2db2f3c263177a11f0315e6d0 Mon Sep 17 00:00:00 2001
From: "Hiram R. Chirino" <chirino@apache.org>
Date: Mon, 30 Apr 2007 13:15:39 +0000
Subject: [PATCH] applied patch in
 https://issues.apache.org/activemq/browse/AMQ-1235

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@533740 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/org/apache/activemq/thread/Scheduler.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java b/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java
index ed05019201..c6cf95067f 100755
--- a/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java
+++ b/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java
@@ -51,7 +51,8 @@ public class Scheduler {
         ScheduledFuture ticket = (ScheduledFuture) clockTickets.remove(task);
         if( ticket!=null ) {
             ticket.cancel(false);
-        	clockDaemon.remove(task);
+            if (ticket instanceof RunnableScheduledFuture)
+            	clockDaemon.remove((RunnableScheduledFuture) ticket);            
         }
     }