You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2011/09/15 07:04:16 UTC
svn commit: r1170956 - in
/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf:
CxfProducer.java interceptors/RawMessageContentRedirectInterceptor.java
Author: ningjiang
Date: Thu Sep 15 05:04:16 2011
New Revision: 1170956
URL: http://svn.apache.org/viewvc?rev=1170956&view=rev
Log:
CAMEL-4429 Applied patch with thanks to Aki
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?rev=1170956&r1=1170955&r2=1170956&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java Thu Sep 15 05:04:16 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/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java?rev=1170956&r1=1170955&r2=1170956&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java Thu Sep 15 05:04:16 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
+ }
}
}
}