Author: dkulp Date: Thu Oct 13 13:32:52 2011 New Revision: 1182848 URL: http://svn.apache.org/viewvc?rev=1182848&view=rev Log:
Update to 2.3.7 version of CXF. Required backporting of: Merged revisions 1170965,1171400 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x ................ r1170965 | ningjiang | 2011-09-15 02:11:30 -0400 (Thu, 15 Sep 2011) | 9 lines 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 ........ ................ r1171400 | ningjiang | 2011-09-16 02:30:13 -0400 (Fri, 16 Sep 2011) | 9 lines Merged revisions 1171396 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1171396 | ningjiang | 2011-09-16 14:19:22 +0800 (Fri, 16 Sep 2011) | 1 line CAMEL-4452 avoid the NPE error when there oneway operation for the PayLoad invocation on CxfConsumer ........ ................ Modified: camel/branches/camel-2.7.x/ (props changed) camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java camel/branches/camel-2.7.x/parent/pom.xml Propchange: camel/branches/camel-2.7.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 13 13:32:52 2011 @@ -1,2 +1,2 @@ -/camel/branches/camel-2.8.x:1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598 -/camel/trunk:1146608,1146903,1147216,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597 +/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598 +/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597 Propchange: camel/branches/camel-2.7.x/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Thu Oct 13 13:32:52 2011 @@ -1 +1 @@ -/camel/branches/camel-2.8.x:1-1146127,1146608,1146653,1146771,1146903,1147216,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598 +/camel/branches/camel-2.8.x:1-1146127,1146608,1146653,1146771,1146903,1147216,1170965-1171083,1171085-1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598 Modified: camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java?rev=1182848&r1=1182847&r2=1182848&view=diff ============================================================================== --- camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java (original) +++ camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java Thu Oct 13 13:32:52 2011 @@ -394,11 +394,11 @@ public class DefaultCxfBinding implement MessageContentsList answer = new MessageContentsList(); int i = 0; - - for (MessagePartInfo partInfo : boi.getOutput().getMessageParts()) { - if (elements.size() > i) { - answer.put(partInfo, elements.get(i++)); - + if (boi.getOutput() != null) { + for (MessagePartInfo partInfo : boi.getOutput().getMessageParts()) { + if (elements.size() > i) { + answer.put(partInfo, elements.get(i++)); + } } } Modified: camel/branches/camel-2.7.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.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java?rev=1182848&r1=1182847&r2=1182848&view=diff ============================================================================== --- camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java (original) +++ camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java Thu Oct 13 13:32:52 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 + } } } } Modified: camel/branches/camel-2.7.x/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/parent/pom.xml?rev=1182848&r1=1182847&r2=1182848&view=diff ============================================================================== --- camel/branches/camel-2.7.x/parent/pom.xml (original) +++ camel/branches/camel-2.7.x/parent/pom.xml Thu Oct 13 13:32:52 2011 @@ -51,7 +51,7 @@ <commons-collections-version>3.2.1</commons-collections-version> <commons-pool-version>1.5.4</commons-pool-version> <commons-dbcp-version>1.3</commons-dbcp-version> - <cxf-version>2.3.5</cxf-version> + <cxf-version>2.3.7</cxf-version> <cxf-xjc-utils-version>2.3.2</cxf-xjc-utils-version> <derby-version>10.4.2.0</derby-version> <dnsjava-version>2.1.0</dnsjava-version>
