You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/01/17 06:38:52 UTC
svn commit: r1232309 -
/camel/trunk/camel-core/src/main/java/org/apache/camel/support/TimerListenerManager.java
Author: davsclaus
Date: Tue Jan 17 05:38:52 2012
New Revision: 1232309
URL: http://svn.apache.org/viewvc?rev=1232309&view=rev
Log:
Fixed potential NPE in doStop
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/support/TimerListenerManager.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/support/TimerListenerManager.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/support/TimerListenerManager.java?rev=1232309&r1=1232308&r2=1232309&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/support/TimerListenerManager.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/support/TimerListenerManager.java Tue Jan 17 05:38:52 2012
@@ -111,7 +111,10 @@ public class TimerListenerManager extend
@Override
protected void doStop() throws Exception {
// executor service will be shutdown by CamelContext
- task.cancel(true);
+ if (task != null) {
+ task.cancel(true);
+ task = null;
+ }
}
}