activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r533739 - /activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java
Date Mon, 30 Apr 2007 13:14:26 GMT
Author: chirino
Date: Mon Apr 30 06:14:25 2007
New Revision: 533739

URL: http://svn.apache.org/viewvc?view=rev&rev=533739
Log:
Applied patch https://issues.apache.org/activemq/browse/AMQ-1235

Modified:
    activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java

Modified: activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java?view=diff&rev=533739&r1=533738&r2=533739
==============================================================================
--- activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java
(original)
+++ activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java
Mon Apr 30 06:14:25 2007
@@ -52,7 +52,8 @@
         ScheduledFuture ticket = (ScheduledFuture) clockTickets.remove(task);
         if( ticket!=null ) {
             ticket.cancel(false);
-        	clockDaemon.remove(task);
+            if (ticket instanceof RunnableScheduledFuture)
+            	clockDaemon.remove((RunnableScheduledFuture) ticket);            
         }
     }
 



Mime
View raw message