You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ha...@apache.org on 2005/12/05 21:21:08 UTC
svn commit: r354157 - in /webservices/axis/trunk/c:
src/soap/SoapDeSerializer.cpp
src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java
tests/utils/monitor/org/apache/test/MockServerThread.java
Author: hawkeye
Date: Mon Dec 5 12:20:55 2005
New Revision: 354157
URL: http://svn.apache.org/viewcvs?rev=354157&view=rev
Log:
Fixed missing comma in SoapDeSerializer. Also now use correct soapelement name in BeanParamWriter depending on whether we are deserialising in an attribute or an element.
Modified:
webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java
webservices/axis/trunk/c/tests/utils/monitor/org/apache/test/MockServerThread.java
Modified: webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp?rev=354157&r1=354156&r2=354157&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp (original)
+++ webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp Mon Dec 5 12:20:55 2005
@@ -1686,7 +1686,7 @@
else if (m_pNode && (END_ELEMENT == m_pNode->m_type) && bNillFound ) //xsi:nil="true"
{
pSimpleType->deserialize(NULL);
- m_pNode = NULL
+ m_pNode = NULL;
return;
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java?rev=354157&r1=354156&r2=354157&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java Mon Dec 5 12:20:55 2005
@@ -939,6 +939,8 @@
}
else
{
+ String elementNameToSearchFor = attribs[i].isAttribute()? attribs[i].getParamNameAsMember():attribs[i].getSOAPElementNameAsString();
+
writer.write("\t" + attribs[i].getTypeName() + " * "
+ attribs[i].getParamNameAsMember()
+ " = NULL;\n\n");
@@ -947,7 +949,7 @@
+ " = pIWSDZ->"
+ CUtils.getParameterGetValueMethodName(
attribs[i].getTypeName(), attribs[i].isAttribute()) + "( \""
- + CUtils.sanitiseAttributeName( classname, soapTagName) + "\",0)) != NULL)\n\t{\n");
+ + elementNameToSearchFor + "\",0)) != NULL)\n\t{\n");
writer.write("\t\tparam->"
+ attribs[i].getParamNameAsMember() + " = *( "
+ attribs[i].getParamNameAsMember() + " );\n");
Modified: webservices/axis/trunk/c/tests/utils/monitor/org/apache/test/MockServerThread.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/utils/monitor/org/apache/test/MockServerThread.java?rev=354157&r1=354156&r2=354157&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/utils/monitor/org/apache/test/MockServerThread.java (original)
+++ webservices/axis/trunk/c/tests/utils/monitor/org/apache/test/MockServerThread.java Mon Dec 5 12:20:55 2005
@@ -320,6 +320,7 @@
}
responses[i-1]=new Response(tmpString);
}
+ System.out.println("MockServer got "+(responses.length-1)+" responses");
}
// /**