svn commit: r1232311 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/support/TimerListenerManager.java

[davsclaus]

Author: davsclaus
Date: Tue Jan 17 05:48:14 2012
New Revision: 1232311

URL: http://svn.apache.org/viewvc?rev=1232311&view=rev
Log:
Fixed potential NPE in doStop

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/support/TimerListenerManager.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 17 05:48:14 2012
@@ -1 +1 @@
-/camel/trunk:1227209,1227212,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704
+/camel/trunk:1227209,1227212,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan 17 05:48:14 2012
@@ -1 +1 @@
-/camel/trunk:1-1227196,1227209,1227212,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704
+/camel/trunk:1-1227196,1227209,1227212,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309

Modified: 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/support/TimerListenerManager.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/support/TimerListenerManager.java?rev=1232311&r1=1232310&r2=1232311&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/support/TimerListenerManager.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/support/TimerListenerManager.java
 Tue Jan 17 05:48:14 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;
+        }
     }
 
 }