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 2009/07/16 16:43:36 UTC
svn commit: r794696 -
/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
Author: davsclaus
Date: Thu Jul 16 14:43:35 2009
New Revision: 794696
URL: http://svn.apache.org/viewvc?rev=794696&view=rev
Log:
Fixed potential NPE on shutdown in case the stream endpoint uri is invalid.
Modified:
camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
Modified: camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java?rev=794696&r1=794695&r2=794696&view=diff
==============================================================================
--- camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java (original)
+++ camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java Thu Jul 16 14:43:35 2009
@@ -19,7 +19,6 @@
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -82,9 +81,10 @@
public void doStop() throws Exception {
// important: do not close the stream as it will close the standard
// system.in etc.
- ObjectHelper.notNull(executor, "Executor");
- executor.shutdownNow();
- executor = null;
+ if (executor != null) {
+ executor.shutdownNow();
+ executor = null;
+ }
super.doStop();
}