svn commit: r1170965 - in /camel/branches/camel-2.8.x: ./ components/camel-cxf/src/main/java/org/apache/camel/component/cxf/ components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/

[ningjiang]

Author: ningjiang
Date: Thu Sep 15 06:11:30 2011
New Revision: 1170965

URL: http://svn.apache.org/viewvc?rev=1170965&view=rev
Log:
Merged revisions 1170956 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1170956 | ningjiang | 2011-09-15 13:04:16 +0800 (Thu, 15 Sep 2011) | 1 line
  
  CAMEL-4429 Applied patch with thanks to  Aki
........

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
    
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 15 06:11:30 2011
@@ -1 +1 @@
-/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163231,1163420,1164544,1164557,1164633,1164973-1165000,1165152,1165157,1165658,1165971,1165987,1167098,1167131,1167448,1167487,1167555,1169610,1169620,1170122,1170226,1170397
+/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163231,1163420,1164544,1164557,1164633,1164973-1165000,1165152,1165157,1165658,1165971,1165987,1167098,1167131,1167448,1167487,1167555,1169610,1169620,1170122,1170226,1170397,1170956

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?rev=1170965&r1=1170964&r2=1170965&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
 (original)
+++ 
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
 Thu Sep 15 06:11:30 2011
@@ -162,8 +162,6 @@ public class CxfProducer extends Default
         if (dataFormat == DataFormat.MESSAGE) {
             cxfExchange.put(Client.KEEP_CONDUIT_ALIVE, true);
             LOG.trace("Set CXF Exchange property: {}={}", 
Client.KEEP_CONDUIT_ALIVE, true);
-            // Ignore the partical response message handling
-            requestContext.put("org.apache.cxf.partial.response.handling", 
Boolean.FALSE);
         }
      
         // bind the request CXF exchange

Modified: 
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java?rev=1170965&r1=1170964&r2=1170965&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
 (original)
+++ 
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
 Thu Sep 15 06:11:30 2011
@@ -44,16 +44,18 @@ public class RawMessageContentRedirectIn
         }
 
         List<?> params = message.getContent(List.class);
-        InputStream is = (InputStream)params.get(0);
-        OutputStream os = message.getContent(OutputStream.class);
+        if (null != params) {
+            InputStream is = (InputStream)params.get(0);
+            OutputStream os = message.getContent(OutputStream.class);
 
-        try {
-            IOHelper.copy(is, os);
-        } catch (Exception e) {
-            throw new Fault(e);
-        } finally {
-            IOHelper.close(is, "input stream", null);
-            // Should not close the output stream as the interceptor chain 
will close it
+            try {
+                IOHelper.copy(is, os);
+            } catch (Exception e) {
+                throw new Fault(e);
+            } finally {
+                IOHelper.close(is, "input stream", null);
+                // Should not close the output stream as the interceptor chain 
will close it
+            }
         }
     }
 }