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/07/10 03:50:58 UTC
svn commit: r675408 - in
/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws:
WrapperUtils.java c/BeanParamWriter.java cpp/BeanParamWriter.java
Author: nadiramra
Date: Wed Jul 9 18:50:57 2008
New Revision: 675408
URL: http://svn.apache.org/viewvc?rev=675408&view=rev
Log:
AXISCPP-1044 - The use of "ref" inside WSDL schemas is not supported.
Modified:
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperUtils.java
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/WrapperUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperUtils.java?rev=675408&r1=675407&r2=675408&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperUtils.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperUtils.java Wed Jul 9 18:50:57 2008
@@ -143,7 +143,7 @@
return "AnyType*";
Type type = wscontext.getTypemap().getType(param.getSchemaName());
- if (type.isSimpleType())
+ if (null != type && type.isSimpleType())
{
String name = param.getLangName();
@@ -155,7 +155,7 @@
else if (!TypeMap.isSimpleType(param.getSchemaName()))
{
//array or complex types
- if (type.isArray())
+ if (null != type && type.isArray())
{
String arrayName = CUtils.getCmplxArrayNameforType(getArrayType(type).getName());
if (null == arrayName)
@@ -173,7 +173,7 @@
//All complex types will be pointers
}
}
- else if (param.isArray())
+ else if (null != type && param.isArray())
{
/* This enables having simple type array declarations in the wrapping element
* <s:element name="GetProjectNamesResponse">
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=675408&r1=675407&r2=675408&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 Wed Jul 9 18:50:57 2008
@@ -239,6 +239,8 @@
ifCheckPrinted = true;
writer.write("(param->" + attribs[i].getParamNameAsMember() + ")\n\t{\n\t");
}
+ else
+ firstIfWritten = false;
//if the attribute is a 'all' following should do
if (attribs[i].getAllElement())
@@ -545,6 +547,8 @@
writer.write("(strcmp(choiceName,\""
+ attribs[i].getElementNameAsSOAPString() + "\")==0)\n\t{\n\t");
}
+ else
+ firstIfWritten = false;
//if the attribute is a 'all' construct we have to check Min
// occures
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=675408&r1=675407&r2=675408&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 Wed Jul 9 18:50:57 2008
@@ -462,6 +462,8 @@
ifCheckPrinted = true;
writer.write("(param->" + attribs[i].getParamNameAsMember() + ")\n\t{\n\t");
}
+ else
+ firstIfWritten = false;
//if the attribute is a 'all' following should do
if (attribs[i].getAllElement())
@@ -777,6 +779,8 @@
writer.write("(strcmp(choiceName,\""
+ attribs[i].getElementNameAsSOAPString() + "\")==0)\n\t{\n\t");
}
+ else
+ firstIfWritten = false;
//if the attribute is a 'all' construct we have to check Min
// occures