svn commit: r1189693 - in /camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream: StreamEndpoint.java StreamProducer.java

[ni...@apache.org]

Author: ningjiang
Date: Thu Oct 27 09:50:09 2011
New Revision: 1189693

URL: http://svn.apache.org/viewvc?rev=1189693&view=rev
Log:
CAMEL-4581 fix the NPE issue of stream endpoint

Modified:
    camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
    camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java

Modified: camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java?rev=1189693&r1=1189692&r2=1189693&view=diff
==============================================================================
--- camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java (original)
+++ camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java Thu Oct 27 09:50:09 2011
@@ -40,6 +40,7 @@ public class StreamEndpoint extends Defa
     private long promptDelay;
     private long initialPromptDelay = 2000;
     private int groupLines;
+    private Charset charset;
 
     public StreamEndpoint(String endpointUri, Component component) throws Exception {
         super(endpointUri, component);
@@ -151,11 +152,19 @@ public class StreamEndpoint extends Defa
     public void setGroupLines(int groupLines) {
         this.groupLines = groupLines;
     }
+    
+    public Charset getCharset() {
+        return charset;
+    }
 
     // Implementations
     //-------------------------------------------------------------------------
 
-    Charset getCharset() {
+    protected void doStart() throws Exception {
+        charset = loadCharset();
+    }
+    
+    Charset loadCharset() {
         if (encoding == null) {
             encoding = Charset.defaultCharset().name();
             LOG.debug("No encoding parameter using default charset: {}", encoding);

Modified: camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java?rev=1189693&r1=1189692&r2=1189693&view=diff
==============================================================================
--- camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java (original)
+++ camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java Thu Oct 27 09:50:09 2011
@@ -45,8 +45,6 @@ public class StreamProducer extends Defa
     private static final String TYPES = "out,err,file,header,url";
     private static final String INVALID_URI = "Invalid uri, valid form: 'stream:{" + TYPES + "}'";
     private static final List<String> TYPES_LIST = Arrays.asList(TYPES.split(","));
-    private OutputStream outputStream = System.out;
-    private boolean isSystemStream;
     private StreamEndpoint endpoint;
     private String uri;
 
@@ -56,16 +54,10 @@ public class StreamProducer extends Defa
         validateUri(uri);
     }
 
-    @Override
-    public void doStop() throws Exception {
-        closeStream();
-        super.doStop();
-    }
-
     public void process(Exchange exchange) throws Exception {
         delay(endpoint.getDelay());
-
-        isSystemStream = false;
+        OutputStream outputStream = System.out;         
+        boolean isSystemStream = false;
         if ("out".equals(uri)) {
             isSystemStream = true;
             outputStream = System.out;
@@ -80,8 +72,8 @@ public class StreamProducer extends Defa
             outputStream = resolveStreamFromUrl();
         }
 
-        writeToStream(exchange);
-        closeStream();
+        writeToStream(outputStream, exchange);
+        closeStream(outputStream, isSystemStream);
     }
 
     private OutputStream resolveStreamFromUrl() throws IOException {
@@ -116,7 +108,7 @@ public class StreamProducer extends Defa
         Thread.sleep(ms);
     }
 
-    private void writeToStream(Exchange exchange) throws IOException, CamelExchangeException {
+    private void writeToStream(OutputStream outputStream, Exchange exchange) throws IOException, CamelExchangeException {
         Object body = exchange.getIn().getBody();
 
         // if not a string then try as byte array first
@@ -142,12 +134,11 @@ public class StreamProducer extends Defa
         bw.flush();
     }
 
-    private void closeStream() throws Exception {
+    private void closeStream(OutputStream outputStream, boolean isSystemStream) throws Exception {
         // important: do not close the writer on a standard system.out etc.
         if (outputStream != null && !isSystemStream) {
             outputStream.close();
         }
-        outputStream = null;
     }
 
     private void validateUri(String uri) throws Exception {