Return-Path: 
 <axis-cvs-return-22904-apmail-ws-axis-dev-archive=ws.apache.org@ws.apache.org>
Delivered-To: apmail-ws-axis-dev-archive@www.apache.org
Received: (qmail 28372 invoked from network); 5 Apr 2007 05:16:43 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 5 Apr 2007 05:16:43 -0000
Received: (qmail 7206 invoked by uid 500); 5 Apr 2007 05:16:49 -0000
Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org
Received: (qmail 7085 invoked by uid 500); 5 Apr 2007 05:16:49 -0000
Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:axis-cvs-help@ws.apache.org>
list-unsubscribe: <mailto:axis-cvs-unsubscribe@ws.apache.org>
List-Post: <mailto:axis-cvs@ws.apache.org>
List-Id: <axis-cvs.ws.apache.org>
Delivered-To: mailing list axis-cvs@ws.apache.org
Received: (qmail 7070 invoked by uid 500); 5 Apr 2007 05:16:49 -0000
Delivered-To: apmail-ws-axis2-cvs@ws.apache.org
Received: (qmail 7067 invoked by uid 99); 5 Apr 2007 05:16:49 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Apr 2007 22:16:49 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Apr 2007 22:16:41 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 68E7A1A9838; Wed,  4 Apr 2007 22:16:21 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r525702 -
 /webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateSource.xsl
Date: Thu, 05 Apr 2007 05:16:21 -0000
To: axis2-cvs@ws.apache.org
From: milinda@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070405051621.68E7A1A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: milinda
Date: Wed Apr  4 22:16:20 2007
New Revision: 525702

URL: http://svn.apache.org/viewvc?view=rev&rev=525702
Log:
Improvements to nillable element handling logic.

Modified:
    webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateSource.xsl

Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateSource.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateSource.xsl?view=diff&rev=525702&r1=525701&r2=525702
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateSource.xsl (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateSource.xsl Wed Apr  4 22:16:20 2007
@@ -647,32 +647,129 @@
                                     </xsl:when>
                                     <xsl:when test="$nativePropertyType='char'">
                                       text_value = axiom_element_get_text(current_element, env, current_node );
+                                        <xsl:choose>
+                                            <xsl:when test="@nillable">
+                                            if(text_value == NULL)
+                                            {
+                                                status = AXIS2_FAILURE;
+                                            }
+                                            else
+                                            {
+                                                status = <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>( <xsl:value-of select="$name"/>, env,
+                                                                    (char)atoi( text_value));
+                                            }
+
+                                            </xsl:when>
+                                            <xsl:otherwise>
                                       status = <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>( <xsl:value-of select="$name"/>, env,
                                                                     (char)atoi( text_value));
+                                            </xsl:otherwise>
+                                        </xsl:choose>
                                     </xsl:when>
                                     <xsl:when test="$nativePropertyType='int'">
                                       text_value = axiom_element_get_text(current_element, env, current_node );
+                                        <xsl:choose>
+                                            <xsl:when test="@nillable">
+                                            if(text_value == NULL)
+                                            {
+                                                status = AXIS2_FAILURE;
+                                            }
+                                            else
+                                            {
+                                                status = <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>( <xsl:value-of select="$name"/>, env,
+                                                                    atoi( text_value));
+                                            }
+
+                                            </xsl:when>
+                                            <xsl:otherwise>
                                       status = <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>( <xsl:value-of select="$name"/>, env,
                                                                     atoi( text_value));
+                                            </xsl:otherwise>
+                                        </xsl:choose>
                                    </xsl:when>
                                     <xsl:when test="$nativePropertyType='short'">
                                       text_value = axiom_element_get_text(current_element, env, current_node );
+                                      <xsl:choose>
+                                            <xsl:when test="@nillable">
+                                            if(text_value == NULL)
+                                            {
+                                                status = AXIS2_FAILURE;
+                                            }
+                                            else
+                                            {
+                                               status = <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>( <xsl:value-of select="$name"/>, env,
+                                                                    atoi( text_value));
+                                            }
+
+                                            </xsl:when>
+                                            <xsl:otherwise>
                                       status = <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>( <xsl:value-of select="$name"/>, env,
                                                                     atoi( text_value));
+                                         </xsl:otherwise>
+                                        </xsl:choose>
                                     </xsl:when>
                                     <xsl:when test="$nativePropertyType='float'">
                                       text_value = axiom_element_get_text(current_element, env, current_node );
+                                      <xsl:choose>
+                                            <xsl:when test="@nillable">
+                                            if(text_value == NULL)
+                                            {
+                                                status = AXIS2_FAILURE;
+                                            }
+                                            else
+                                            {
+                                               status = <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>( <xsl:value-of select="$name"/>, env,
+                                                                     atof( text_value));
+                                            }
+
+                                            </xsl:when>
+                                            <xsl:otherwise>
                                       status = <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>( <xsl:value-of select="$name"/>, env,
+                                                                     atof( text_value));
+                                        </xsl:otherwise>
+                                        </xsl:choose>
                                      </xsl:when>
                                     <xsl:when test="$nativePropertyType='double'">
                                       text_value = axiom_element_get_text(current_element, env, current_node );
+                                      <xsl:choose>
+                                            <xsl:when test="@nillable">
+                                            if(text_value == NULL)
+                                            {
+                                                status = AXIS2_FAILURE;
+                                            }
+                                            else
+                                            {
+                                               status = <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>( <xsl:value-of select="$name"/>, env,
+                                                                     atof( text_value));
+                                            }
+
+                                            </xsl:when>
+                                            <xsl:otherwise>
                                       status = <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>( <xsl:value-of select="$name"/>, env,
                                                                      atof( text_value));
+                                        </xsl:otherwise>
+                                        </xsl:choose>
                                     </xsl:when>
                                     <xsl:when test="$nativePropertyType='long'">
                                       text_value = axiom_element_get_text(current_element, env, current_node );
+                                      <xsl:choose>
+                                            <xsl:when test="@nillable">
+                                            if(text_value == NULL)
+                                            {
+                                                status = AXIS2_FAILURE;
+                                            }
+                                            else
+                                            {
+                                               status = <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>( <xsl:value-of select="$name"/>, env,
+                                                                     atol( text_value));
+                                            }
+
+                                            </xsl:when>
+                                            <xsl:otherwise>
                                       status = <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>( <xsl:value-of select="$name"/>, env,
-                                                                      atol( text_value));
+                                                                     atol( text_value));
+                                        </xsl:otherwise>
+                                        </xsl:choose>
                                     </xsl:when>
                                     <xsl:when test="$nativePropertyType='axiom_node_t*'">
                                       text_value = NULL; /** just to avoid warning */
@@ -681,16 +778,36 @@
                                     </xsl:when>
                                     <xsl:when test="$nativePropertyType='axis2_bool_t'">
                                       text_value = axiom_element_get_text(current_element, env, current_node );
-                                      if ( !strcmp ( text_value , "true" ) || !strcmp ( text_value, "TRUE") )
-                                      {
-                                         status = <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>( <xsl:value-of select="$name"/>, env,
+                                         <xsl:choose>
+                                            <xsl:when test="@nillable">
+                                            if(text_value == NULL)
+                                            {
+                                                status = AXIS2_FAILURE;
+                                            }
+                                            else if ( !strcmp ( text_value , "true" ) || !strcmp ( text_value, "TRUE") )
+                                            {
+                                                status = <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>( <xsl:value-of select="$name"/>, env,
+                                                                 AXIS2_TRUE);
+                                            }
+                                            else
+                                            {
+                                                status = <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>( <xsl:value-of select="$name"/>, env,
+                                                                      AXIS2_FALSE);
+                                            }
+                                            </xsl:when>
+                                             <xsl:otherwise>
+                                                 if ( !strcmp ( text_value , "true" ) || !strcmp ( text_value, "TRUE") )
+                                                {
+                                                    status = <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>( <xsl:value-of select="$name"/>, env,
                                                                       AXIS2_TRUE);
-                                      }
-                                      else
-                                      {
-                                         status = <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>( <xsl:value-of select="$name"/>, env,
+                                                }
+                                                else
+                                                {
+                                                    status = <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>( <xsl:value-of select="$name"/>, env,
                                                                       AXIS2_FALSE);
-                                      }
+                                                }
+                                             </xsl:otherwise>
+                                        </xsl:choose>
                                     </xsl:when>
                                     <xsl:when test="$nativePropertyType='axis2_date_time_t*'">
                                       element = (void*)axutil_date_time_create( env);
@@ -1594,7 +1711,7 @@
                       return AXIS2_FAILURE;
                   }
                 </xsl:if>
-                <xsl:if test="not(@nillable) and @ours">
+                <xsl:if test="not(@nillable) and not(@minOccurs='0') and (@ours or not($propertyType='char' or $propertyType='int' or $propertyType='short' or $propertyType='float' or $propertyType='double' or $propertyType='long' or $propertyType='axis2_bool_t'))">
                   if( NULL == param_<xsl:value-of select="$CName"/> )
                   {
                       AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "<xsl:value-of select="$propertyName"/> is NULL, but not a nullable element"



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org