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 di...@apache.org on 2005/06/17 10:11:16 UTC
cvs commit: ws-axis/c/tests/auto_build/testcases/client/cpp InOutClient.cpp
dicka 2005/06/17 01:11:16
Modified: c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal
BeanParamWriter.java ParmHeaderFileWriter.java
c/tests/auto_build/testcases/client/cpp InOutClient.cpp
Log:
Resolve problem in WSDL2Ws causing NullPointerExceptions when processing XSDAttribute testcase.
Also fix small problem this uncovered in InOut client testcase.
PR: AXISCPP-701
Submitted by: Adrian Dick
Revision Changes Path
1.77 +5 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java
Index: BeanParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- BeanParamWriter.java 16 Jun 2005 16:26:05 -0000 1.76
+++ BeanParamWriter.java 17 Jun 2005 08:11:15 -0000 1.77
@@ -1296,9 +1296,12 @@
ElementInfo ei = type.getElementForElementName(attribs[index].getParamName());
boolean bNillable = false;
- if (ei != null && attribs[index].isSimpleType() && !CUtils.isPointerType(attribs[index].getTypeName()))
+ if (ei != null
+ && attribs[index].isSimpleType()
+ && !attribs[index].isArray()
+ && !CUtils.isPointerType(attribs[index].getTypeName()) )
{
- bNillable = ei.getNillable() & ei.getType().isSimpleType();
+ bNillable = ei.getNillable();
}
return bNillable;
1.39 +5 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java
Index: ParmHeaderFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ParmHeaderFileWriter.java 16 Jun 2005 16:26:06 -0000 1.38
+++ ParmHeaderFileWriter.java 17 Jun 2005 08:11:16 -0000 1.39
@@ -477,9 +477,12 @@
.getParamName());
boolean bNillable = false;
- if (ei != null && attribs[index].isSimpleType() && !CUtils.isPointerType(attribs[index].getTypeName()))
+ if (ei != null
+ && attribs[index].isSimpleType()
+ && !attribs[index].isArray()
+ && !CUtils.isPointerType(attribs[index].getTypeName()))
{
- bNillable = ei.getNillable() & ei.getType().isSimpleType();
+ bNillable = ei.getNillable();
}
return bNillable;
1.6 +4 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/InOutClient.cpp
Index: InOutClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/InOutClient.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InOutClient.cpp 23 Mar 2005 15:45:06 -0000 1.5
+++ InOutClient.cpp 17 Jun 2005 08:11:16 -0000 1.6
@@ -113,7 +113,8 @@
stringArray.m_Array[2]="Six";
ComplexNilType1 cnt;
- cnt.ctLong = (xsd__long)87654321;
+ xsd__long * longValue = new xsd__long(87654321);
+ cnt.ctLong = longValue;
cnt.ctString = NULL;
cnt.ctIntArray = intArray;
@@ -121,6 +122,8 @@
mcpir = ws.multiComplexParametersNilIntReturn(NULL, &cnt, NULL, NULL, stringArray);
cout << "multiComplexParametersNilIntReturn returned " << mcpir << endl;
+ delete longValue;
+
/* Commented out as there is a bug in WSDL2Ws.
* AXISCPP-565 is the Jira against this problem.
*