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 47955E46C for ; Mon, 28 Jan 2013 06:20:23 +0000 (UTC) Received: (qmail 83023 invoked by uid 500); 28 Jan 2013 06:20:22 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 82934 invoked by uid 500); 28 Jan 2013 06:20:20 -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 82911 invoked by uid 99); 28 Jan 2013 06:20:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Jan 2013 06:20:20 +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; Mon, 28 Jan 2013 06:20:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 807B523888CD; Mon, 28 Jan 2013 06:19:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1439268 - in /cxf/branches/2.6.x-fixes: ./ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java Date: Mon, 28 Jan 2013 06:19:57 -0000 To: commits@cxf.apache.org From: ffang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130128061957.807B523888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ffang Date: Mon Jan 28 06:19:57 2013 New Revision: 1439268 URL: http://svn.apache.org/viewvc?rev=1439268&view=rev Log: Merged revisions 1439264 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ................ r1439264 | ffang | 2013-01-28 13:56:22 +0800 (一, 28 1 2013) | 9 lines Merged revisions 1439260 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1439260 | ffang | 2013-01-28 13:50:01 +0800 (一, 28 1 2013) | 1 line [CXF-4784]enhance CXF to follow jaxws spec 3.6.2.3 when using RI or Axis2 client ........ ................ Modified: cxf/branches/2.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.7.x-fixes:r1439264 Merged /cxf/trunk:r1439260 Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java?rev=1439268&r1=1439267&r2=1439268&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java (original) +++ cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java Mon Jan 28 06:19:57 2013 @@ -60,20 +60,22 @@ public class RPCOutInterceptor extends A List parts = null; + boolean output = false; if (!isRequestor(message)) { parts = operation.getOutput().getMessageParts(); - addOperationNode(nsStack, message, xmlWriter, true, operation); + output = true; } else { parts = operation.getInput().getMessageParts(); - addOperationNode(nsStack, message, xmlWriter, false, operation); + output = false; } - + MessageContentsList objs = MessageContentsList.getContentsList(message); if (objs == null) { + addOperationNode(nsStack, message, xmlWriter, output, operation); + xmlWriter.writeEndElement(); return; } - - + for (MessagePartInfo part : parts) { if (objs.hasValue(part)) { Object o = objs.get(part); @@ -87,8 +89,10 @@ public class RPCOutInterceptor extends A // part.setConcreteName(new QName("", part.getConcreteName().getLocalPart())); } } + + addOperationNode(nsStack, message, xmlWriter, output, operation); writeParts(message, message.getExchange(), operation, objs, parts); - + // Finishing the writing. xmlWriter.writeEndElement(); } catch (XMLStreamException e) {