Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 5644 invoked from network); 29 Nov 2005 15:20:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 29 Nov 2005 15:20:24 -0000 Received: (qmail 77857 invoked by uid 500); 29 Nov 2005 15:19:34 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 77771 invoked by uid 500); 29 Nov 2005 15:19:33 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 77728 invoked by uid 99); 29 Nov 2005 15:19:33 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 29 Nov 2005 07:19:32 -0800 Received: (qmail 3994 invoked by uid 65534); 29 Nov 2005 15:19:12 -0000 Message-ID: <20051129151912.3993.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r349726 - in /webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws: ParamWriter.java cpp/literal/ParmHeaderFileWriter.java Date: Tue, 29 Nov 2005 15:19:10 -0000 To: axis-cvs@ws.apache.org From: dicka@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: dicka Date: Tue Nov 29 07:19:05 2005 New Revision: 349726 URL: http://svn.apache.org/viewcvs?rev=349726&view=rev Log: nillable elements within complex types is not always correctly detected. Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java?rev=349726&r1=349725&r2=349726&view=diff ============================================================================== --- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java (original) +++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java Tue Nov 29 07:19:05 2005 @@ -223,6 +223,7 @@ } if (elem.getMinOccurs() == 0) this.attribs[i].setOptional(true); + this.attribs[i].setNillable(elem.getNillable()); } } Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java?rev=349726&r1=349725&r2=349726&view=diff ============================================================================== --- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java (original) +++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java Tue Nov 29 07:19:05 2005 @@ -592,16 +592,13 @@ // FJP Nillable vv protected boolean isElementNillable(int index) { - ElementInfo ei = type.getElementForElementName(attribs[index] - .getParamName()); boolean bNillable = false; - if (ei != null - && attribs[index].isSimpleType() + if (attribs[index].isSimpleType() && !attribs[index].isArray() && !CUtils.isPointerType(attribs[index].getTypeName())) { - bNillable = ei.getNillable(); + bNillable = attribs[index].isNillable(); } return bNillable;