Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 455 invoked from network); 29 Oct 2009 14:59:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 29 Oct 2009 14:59:07 -0000 Received: (qmail 82780 invoked by uid 500); 29 Oct 2009 14:59:07 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 82711 invoked by uid 500); 29 Oct 2009 14:59:07 -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 82700 invoked by uid 99); 29 Oct 2009 14:59:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Oct 2009 14:59:07 +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, 29 Oct 2009 14:59:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 419A223888FF; Thu, 29 Oct 2009 14:58:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r830985 - in /cxf/branches/2.1.x-fixes: ./ tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java Date: Thu, 29 Oct 2009 14:58:42 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091029145842.419A223888FF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Oct 29 14:58:41 2009 New Revision: 830985 URL: http://svn.apache.org/viewvc?rev=830985&view=rev Log: Merged revisions 830978 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes ................ r830978 | dkulp | 2009-10-29 10:52:42 -0400 (Thu, 29 Oct 2009) | 9 lines Merged revisions 830966 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r830966 | dkulp | 2009-10-29 10:40:57 -0400 (Thu, 29 Oct 2009) | 1 line [CXF-1817] Add a depth check to make sure we don't recurse forever ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java Propchange: cxf/branches/2.1.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=830985&r1=830984&r2=830985&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java (original) +++ cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java Thu Oct 29 14:58:41 2009 @@ -626,17 +626,28 @@ writeDefaultType(writer, m.listParamTypes()[0], path + "/" + m.name().substring(3)); writer.write(");"); } else { - writeDefaultValue(writer, indent, - path + "/" + m.name().substring(3), - varName + m.name().substring(3), - m.listParamTypes()[0]); - writer.write("\n"); + int idx = path.indexOf("/" + m.name().substring(3) + "/"); + if (idx > 0) { + idx = path.indexOf("/" + m.name().substring(3) + "/", idx + 1); + } + boolean hasTwo = idx > 0; + if (!hasTwo) { + writeDefaultValue(writer, indent, + path + "/" + m.name().substring(3), + varName + m.name().substring(3), + m.listParamTypes()[0]); + writer.write("\n"); + } writer.write(indent); writer.write(varName); writer.write("."); writer.write(m.name()); writer.write("("); - writer.write(varName + m.name().substring(3)); + if (!hasTwo) { + writer.write(varName + m.name().substring(3)); + } else { + writer.write("null"); + } writer.write(");"); } } else if (m.type().fullName().startsWith("java.util.List")) {