Author: ningjiang
Date: Tue Mar 12 08:38:52 2013
New Revision: 1455441
URL: http://svn.apache.org/r1455441
Log:
CAMEL-6155 Fixed the systemStream flag issue
Merged revisions 1455433 via svnmerge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
........
r1455433 | ningjiang | 2013-03-12 16:08:04 +0800 (Tue, 12 Mar 2013) | 1 line
CAMEL-6155 Fixed the systemStream flag issue
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-jms/ (props changed)
camel/branches/camel-2.9.x/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/branches/camel-2.10.x:r1455433
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Propchange: camel/branches/camel-2.9.x/components/camel-jms/
------------------------------------------------------------------------------
Merged /camel/branches/camel-2.10.x/components/camel-jms:r1455433
Modified:
camel/branches/camel-2.9.x/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java?rev=1455441&r1=1455440&r2=1455441&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java
Tue Mar 12 08:38:52 2013
@@ -178,7 +178,7 @@ public class StreamProducer extends Defa
// never close a standard stream (system.out or system.err)
// always close a 'header' stream (unless it's a system stream)
- boolean systemStream = outputStream != System.out || outputStream !=
System.err;
+ boolean systemStream = outputStream == System.out || outputStream ==
System.err;
boolean headerStream = "header".equals(uri);
boolean reachedLimit = endpoint.getAutoCloseCount() > 0 &&
count.decrementAndGet() <= 0;
boolean expiredStream = force || headerStream || reachedLimit; //
evaluation order is important!
