Return-Path: Delivered-To: apmail-ws-axis-cvs-archive@www.apache.org Received: (qmail 3796 invoked from network); 20 Mar 2005 18:58:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 20 Mar 2005 18:58:52 -0000 Received: (qmail 88868 invoked by uid 500); 20 Mar 2005 18:58:51 -0000 Delivered-To: apmail-ws-axis-cvs-archive@ws.apache.org Received: (qmail 88795 invoked by uid 500); 20 Mar 2005 18:58:50 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 88782 invoked by uid 99); 20 Mar 2005 18:58:50 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sun, 20 Mar 2005 10:58:50 -0800 Received: (qmail 3765 invoked by uid 1144); 20 Mar 2005 18:58:49 -0000 Date: 20 Mar 2005 18:58:49 -0000 Message-ID: <20050320185849.3764.qmail@minotaur.apache.org> From: gdaniels@apache.org To: ws-axis-cvs@apache.org Subject: cvs commit: ws-axis/java/src/org/apache/axis/wsdl/toJava JavaBeanHelperWriter.java X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N gdaniels 2005/03/20 10:58:49 Modified: java/src/org/apache/axis/wsdl/toJava JavaBeanHelperWriter.java Log: Fix: http://issues.apache.org/jira/browse/AXIS-1869 Don't walk the ref chain unless the TypeEntry is a CollectionTE - this should DTRT for true derived types. Revision Changes Path 1.50 +6 -7 ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java Index: JavaBeanHelperWriter.java =================================================================== RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- JavaBeanHelperWriter.java 3 Mar 2005 18:28:35 -0000 1.49 +++ JavaBeanHelperWriter.java 20 Mar 2005 18:58:49 -0000 1.50 @@ -22,6 +22,7 @@ import org.apache.axis.wsdl.symbolTable.ElementDecl; import org.apache.axis.wsdl.symbolTable.SchemaUtils; import org.apache.axis.wsdl.symbolTable.TypeEntry; +import org.apache.axis.wsdl.symbolTable.CollectionTE; import javax.xml.namespace.QName; import java.io.IOException; @@ -333,17 +334,15 @@ // If we have a DefinedType with dimensions, it must // be a SOAP array derived type. In this case, use // the refType's QName for the metadata. - xmlType = elemType.getRefType().getQName(); + elemType = elemType.getRefType(); } else { - - // Otherwise, use the type at the end of the ref - // chain. - while (elemType.getRefType() != null) { + // Otherwise, use the first non-Collection type we + // encounter up the ref chain. + while (elemType instanceof CollectionTE) { elemType = elemType.getRefType(); } - - xmlType = elemType.getQName(); } + xmlType = elemType.getQName(); pw.print(" ");