Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 85C73D2D4 for ; Wed, 14 Nov 2012 01:25:25 +0000 (UTC) Received: (qmail 90374 invoked by uid 500); 14 Nov 2012 01:25:25 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 90333 invoked by uid 500); 14 Nov 2012 01:25:25 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 90326 invoked by uid 99); 14 Nov 2012 01:25:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Nov 2012 01:25:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Nov 2012 01:25:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DAAFE23888EA; Wed, 14 Nov 2012 01:25:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1409054 - in /cxf/branches/2.4.x-fixes: ./ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java Date: Wed, 14 Nov 2012 01:25:00 -0000 To: commits@cxf.apache.org From: ffang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121114012500.DAAFE23888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ffang Date: Wed Nov 14 01:24:59 2012 New Revision: 1409054 URL: http://svn.apache.org/viewvc?rev=1409054&view=rev Log: Merged revisions 1409046 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ................ r1409046 | ffang | 2012-11-14 08:56:24 +0800 (三, 14 11 2012) | 20 lines Merged revisions 1409044 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ................ r1409044 | ffang | 2012-11-14 08:43:15 +0800 (三, 14 11 2012) | 13 lines Merged revisions 1408627,1409043 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1408627 | ffang | 2012-11-13 15:50:14 +0800 (二, 13 11 2012) | 1 line [CXF-4623]Marshalling Error during asynchronous service invocation when adding a soap header using a SOAPHandler ........ r1409043 | ffang | 2012-11-14 08:19:02 +0800 (三, 14 11 2012) | 1 line [CXF-4623]Marshalling Error during asynchronous service invocation when adding a soap header using a SOAPHandler ........ ................ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.5.x-fixes:r1409046 Merged /cxf/trunk:r1408627,1409043 Merged /cxf/branches/2.6.x-fixes:r1409044 Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java?rev=1409054&r1=1409053&r2=1409054&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java (original) +++ cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java Wed Nov 14 01:24:59 2012 @@ -212,6 +212,7 @@ public class SoapOutInterceptor extends if (headers == null) { return endedHeader; } + for (SoapHeaderInfo header : headers) { MessagePartInfo part = header.getPart(); Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java?rev=1409054&r1=1409053&r2=1409054&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java (original) +++ cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java Wed Nov 14 01:24:59 2012 @@ -258,6 +258,11 @@ public class JaxWsClientProxy extends or AsyncHandler handler; if (params.length > 0 && params[params.length - 1] instanceof AsyncHandler) { handler = (AsyncHandler)params[params.length - 1]; + Object[] newParams = new Object[params.length - 1]; + for (int i = 0; i < newParams.length; i++) { + newParams[i] = params[i]; + } + params = newParams; } else { handler = null; }