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 E74D3D238 for ; Thu, 2 Aug 2012 17:20:10 +0000 (UTC) Received: (qmail 84209 invoked by uid 500); 2 Aug 2012 17:20:10 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 84147 invoked by uid 500); 2 Aug 2012 17:20:10 -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 84140 invoked by uid 99); 2 Aug 2012 17:20:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Aug 2012 17:20:10 +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; Thu, 02 Aug 2012 17:20:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 53BCF2388906; Thu, 2 Aug 2012 17:19:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1368605 - /cxf/branches/2.6.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java Date: Thu, 02 Aug 2012 17:19:26 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120802171926.53BCF2388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Aug 2 17:19:25 2012 New Revision: 1368605 URL: http://svn.apache.org/viewvc?rev=1368605&view=rev Log: Merged revisions 1368601 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1368601 | dkulp | 2012-08-02 13:07:24 -0400 (Thu, 02 Aug 2012) | 2 lines Just set the concrete name and not set it as an element ........ Modified: cxf/branches/2.6.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java Modified: cxf/branches/2.6.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java?rev=1368605&r1=1368604&r2=1368605&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java (original) +++ cxf/branches/2.6.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java Thu Aug 2 17:19:25 2012 @@ -102,7 +102,7 @@ public class XMLBindingFactory extends A for (MessagePartInfo mpi : mi.getMessageParts()) { if (!mpi.isElement()) { //if it's not an element, we need to make it one - mpi.setElementQName(mpi.getName()); + mpi.setConcreteName(mpi.getName()); } } }