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:50:07 UTC
svn commit: r1408374 - in /camel/branches/camel-2.10.x: ./
camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java
Author: davsclaus
Date: Mon Nov 12 17:50:07 2012
New Revision: 1408374
URL: http://svn.apache.org/viewvc?rev=1408374&view=rev
Log:
Fixed potential NPE
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1408373
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java?rev=1408374&r1=1408373&r2=1408374&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java (original)
+++ camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java Mon Nov 12 17:50:07 2012
@@ -243,7 +243,10 @@ public class DefaultExecutorServiceManag
@Override
public void shutdown(ExecutorService executorService) {
- ObjectHelper.notNull(executorService, "executorService");
+ if (executorService == null) {
+ return false;
+ }
+
if (!executorService.isShutdown()) {
LOG.debug("Shutdown ExecutorService: {}", executorService);
Modified: camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java?rev=1408374&r1=1408373&r2=1408374&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java (original)
+++ camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java Mon Nov 12 17:50:07 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 {
}