Author: jstrachan
Date: Tue May 1 05:51:47 2007
New Revision: 534046
URL: http://svn.apache.org/viewvc?view=rev&rev=534046
Log:
Amended patch for AMQ-1235 to not depend on Java 6
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=534046&r1=534045&r2=534046
==============================================================================
---
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
Tue May 1 05:51:47 2007
@@ -51,8 +51,9 @@
ScheduledFuture ticket = (ScheduledFuture) clockTickets.remove(task);
if( ticket!=null ) {
ticket.cancel(false);
- if (ticket instanceof RunnableScheduledFuture)
- clockDaemon.remove((RunnableScheduledFuture) ticket);
+
+ if (ticket instanceof Runnable)
+ clockDaemon.remove((Runnable) ticket);
}
}