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/28 00:09:38 UTC

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

Author: nadiramra
Date: Tue May 27 15:09:38 2008
New Revision: 660743

URL: http://svn.apache.org/viewvc?rev=660743&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=660743&r1=660742&r2=660743&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 15:09:38 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() && !attribs[i].isArray())
+            if (!attribs[i].isAttribute() && attribs[i].isOptional() && !attribs[i].isArray() && !attribs[i].isAnyType())
             {
                 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=660743&r1=660742&r2=660743&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 15:09:38 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() && !attribs[i].isArray())
+            if (!attribs[i].isAttribute() && attribs[i].isOptional() && !attribs[i].isArray() && !attribs[i].isAnyType())
             {
                 writer.write("\tconst char* peekedElementName;\n");
                 break;