You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by na...@apache.org on 2008/05/27 23:54:54 UTC

svn commit: r660734 - in /webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws: c/BeanParamWriter.java cpp/BeanParamWriter.java

Author: nadiramra
Date: Tue May 27 14:54:54 2008
New Revision: 660734

URL: http://svn.apache.org/viewvc?rev=660734&view=rev
Log:
AXISCPP-540 - remove duplication, simplify generated code

Modified:
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java?rev=660734&r1=660733&r2=660734&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java Tue May 27 14:54:54 2008
@@ -482,7 +482,7 @@
         // Determine whether to print variable used for peaking ahead
         for (int i = 0; i < attribs.length; i++)
         {
-            if (attribs[i].isOptional() && !attribs[i].isAttribute())
+            if (attribs[i].isOptional() && !attribs[i].isAttribute() && !attribs[i].isArray())
             {
                 writer.write("\tconst char* peekedElementName;\n");
                 break;

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java?rev=660734&r1=660733&r2=660734&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java Tue May 27 14:54:54 2008
@@ -714,7 +714,7 @@
         // Determine whether to print variable used for peaking ahead
         for (int i = 0; i < attribs.length; i++)
         {
-            if (attribs[i].isOptional() && !attribs[i].isAttribute())
+            if (attribs[i].isOptional() && !attribs[i].isAttribute() && !attribs[i].isArray())
             {
                 writer.write("\tconst char* peekedElementName;\n");
                 break;