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 CDAE2D409 for ; Tue, 13 Nov 2012 19:08:36 +0000 (UTC) Received: (qmail 99406 invoked by uid 500); 13 Nov 2012 19:08:36 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 99344 invoked by uid 500); 13 Nov 2012 19:08:36 -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 99337 invoked by uid 99); 13 Nov 2012 19:08:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Nov 2012 19:08:36 +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; Tue, 13 Nov 2012 19:08:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5CF9723888E7; Tue, 13 Nov 2012 19:08:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1408895 - /cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Date: Tue, 13 Nov 2012 19:08:15 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121113190815.5CF9723888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Nov 13 19:08:14 2012 New Revision: 1408895 URL: http://svn.apache.org/viewvc?rev=1408895&view=rev Log: Merged revisions 1408892 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1408892 | dkulp | 2012-11-13 14:04:05 -0500 (Tue, 13 Nov 2012) | 10 lines Merged revisions 1408890 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1408890 | dkulp | 2012-11-13 13:54:59 -0500 (Tue, 13 Nov 2012) | 2 lines [CXF-4630] With the latest XmlSchema code, you cannot set the element name to null after it's been set. Thus, only set the name if we really intend to. ........ ........ Modified: cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Modified: cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=1408895&r1=1408894&r2=1408895&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original) +++ cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Tue Nov 13 19:08:14 2012 @@ -1270,14 +1270,13 @@ public class ReflectionServiceFactoryBea for (MessagePartInfo mpi : unwrappedMessage.getMessageParts()) { el = new XmlSchemaElement(schema, Boolean.TRUE.equals(mpi.getProperty(HEADER))); - // We hope that we can't have parts that different only in namespace. - el.setName(mpi.getName().getLocalPart()); Map jaxbAnnoMap = getJaxbAnnoMap(mpi); if (mpi.isElement()) { addImport(schema, mpi.getElementQName().getNamespaceURI()); - el.setName(null); XmlSchemaUtils.setElementRefName(el, mpi.getElementQName()); } else { + // We hope that we can't have parts that different only in namespace. + el.setName(mpi.getName().getLocalPart()); if (mpi.getTypeQName() != null && !jaxbAnnoMap.containsKey(XmlList.class)) { el.setSchemaTypeName(mpi.getTypeQName()); addImport(schema, mpi.getTypeQName().getNamespaceURI());