Author: chirino
Date: Mon Apr 30 06:15:39 2007
New Revision: 533740
URL: http://svn.apache.org/viewvc?view=rev&rev=533740
Log:
applied patch in https://issues.apache.org/activemq/browse/AMQ-1235
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java?view=diff&rev=533740&r1=533739&r2=533740
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java Mon
Apr 30 06:15:39 2007
@@ -51,7 +51,8 @@
ScheduledFuture ticket = (ScheduledFuture) clockTickets.remove(task);
if( ticket!=null ) {
ticket.cancel(false);
- clockDaemon.remove(task);
+ if (ticket instanceof RunnableScheduledFuture)
+ clockDaemon.remove((RunnableScheduledFuture) ticket);
}
}
|