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 2013/04/13 10:22:55 UTC
svn commit: r1467574 - in /camel/branches/camel-2.10.x: ./
components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
Author: davsclaus
Date: Sat Apr 13 08:22:55 2013
New Revision: 1467574
URL: http://svn.apache.org/r1467574
Log:
CAMEL-6268: camel-stream - Shutdown thread pool on consumer should happen faster
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1467573
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java?rev=1467574&r1=1467573&r2=1467574&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java (original)
+++ camel/branches/camel-2.10.x/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java Sat Apr 13 08:22:55 2013
@@ -82,8 +82,6 @@ public class StreamConsumer extends Defa
@Override
public void doStop() throws Exception {
- // important: do not close the stream as it will close the standard
- // system.in etc.
if (executor != null) {
endpoint.getCamelContext().getExecutorServiceManager().shutdownNow(executor);
executor = null;
@@ -98,6 +96,8 @@ public class StreamConsumer extends Defa
public void run() {
try {
readFromStream();
+ } catch (InterruptedException e) {
+ // we are closing down so ignore
} catch (Exception e) {
getExceptionHandler().handleException(e);
}