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/11/12 18:49:13 UTC
svn commit: r1408373 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java
Author: davsclaus
Date: Mon Nov 12 17:49:12 2012
New Revision: 1408373
URL: http://svn.apache.org/viewvc?rev=1408373&view=rev
Log:
Fixed potential NPE
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java?rev=1408373&r1=1408372&r2=1408373&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java Mon Nov 12 17:49:12 2012
@@ -278,7 +278,10 @@ public class DefaultExecutorServiceManag
}
private boolean doShutdown(ExecutorService executorService, long shutdownAwaitTermination, boolean failSafe) {
- ObjectHelper.notNull(executorService, "executorService");
+ if (executorService == null) {
+ return false;
+ }
+
boolean warned = false;
// shutting down a thread pool is a 2 step process. First we try graceful, and if that fails, then we go more aggressively
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java?rev=1408373&r1=1408372&r2=1408373&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java Mon Nov 12 17:49:12 2012
@@ -69,7 +69,7 @@ public class FileBeginFailureOneTimeTest
private static class MyStrategy implements GenericFileProcessStrategy<File> {
- private int invoked;
+ private volatile int invoked;
public void prepareOnStartup(GenericFileOperations<File> fileGenericFileOperations, GenericFileEndpoint<File> fileGenericFileEndpoint) throws Exception {
}