Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 7767 invoked from network); 16 Dec 2010 21:02:56 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 16 Dec 2010 21:02:56 -0000 Received: (qmail 93688 invoked by uid 500); 16 Dec 2010 21:02:56 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 93642 invoked by uid 500); 16 Dec 2010 21:02:56 -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 93634 invoked by uid 99); 16 Dec 2010 21:02:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Dec 2010 21:02:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 16 Dec 2010 21:02:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7E9522388A43; Thu, 16 Dec 2010 21:02:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1050157 - in /cxf/branches/2.3.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java systests/ws-specs/src/test/resources/wsdl_systest_wsspec/DoubleIt.wsdl Date: Thu, 16 Dec 2010 21:02:32 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101216210232.7E9522388A43@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Dec 16 21:02:32 2010 New Revision: 1050157 URL: http://svn.apache.org/viewvc?rev=1050157&view=rev Log: Merged revisions 1050156 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1050156 | dkulp | 2010-12-16 15:57:37 -0500 (Thu, 16 Dec 2010) | 2 lines [CXF-3197] Fix NPE in wsdl2java when unwrapping elements that have anonymous types. ........ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/DoubleIt.wsdl Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 16 21:02:32 2010 @@ -1 +1 @@ -/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049937,1050005,1050021,1050095,1050102,1050113 +/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049937,1050005,1050021,1050095,1050102,1050113,1050156 Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?rev=1050157&r1=1050156&r2=1050157&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java (original) +++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java Thu Dec 16 21:02:32 2010 @@ -752,9 +752,9 @@ public class WSDLServiceBuilder { if (el.getSchemaTypeName() != null) { MessagePartInfo mpi = wrapper.addMessagePart(new QName(namespaceURI, el.getName())); mpi.setTypeQName(el.getSchemaTypeName()); - mpi.setConcreteName(el.getQName()); mpi.setElement(true); mpi.setElementQName(el.getQName()); + mpi.setConcreteName(el.getQName()); mpi.setXmlSchema(el); } else if (el.getRefName() != null) { MessagePartInfo mpi = wrapper.addMessagePart(el.getRefName()); @@ -770,8 +770,8 @@ public class WSDLServiceBuilder { } else { // anonymous type MessagePartInfo mpi = wrapper.addMessagePart(new QName(namespaceURI, el.getName())); - mpi.setConcreteName(el.getQName()); mpi.setElementQName(mpi.getName()); + mpi.setConcreteName(el.getQName()); mpi.setElement(true); mpi.setXmlSchema(el); } Modified: cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/DoubleIt.wsdl URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/DoubleIt.wsdl?rev=1050157&r1=1050156&r2=1050157&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/DoubleIt.wsdl (original) +++ cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/DoubleIt.wsdl Thu Dec 16 21:02:32 2010 @@ -25,7 +25,13 @@ - + + + + + + +