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 sa...@apache.org on 2004/11/04 11:42:34 UTC
cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal ClientStubWriter.java
samisa 2004/11/04 02:42:34
Modified: c/src/wsdl/org/apache/axis/wsdl/wsdl2ws CUtils.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp
ClientStubWriter.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal
ClientStubWriter.java
Log:
Added updateStateAfterResponse(); method call after invoking methods in stubs
to help manage Cookie based sessions.
Revision Changes Path
1.25 +1 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java
Index: CUtils.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- CUtils.java 11 Oct 2004 08:32:50 -0000 1.24
+++ CUtils.java 4 Nov 2004 10:42:33 -0000 1.25
@@ -385,7 +385,7 @@
if (baseEType != null) {
String javaName = TypeMap.getBasicTypeClass4qname(baseEType.getQName());
//String javaName = baseEType.getName();
- if (javaName.equals("boolean") ||
+ if (javaName == null || javaName.equals("boolean") ||
! SchemaUtils.isSimpleSchemaType(baseEType.getQName())) {
baseEType = null;
}
1.59 +31 -8 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
Index: ClientStubWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ClientStubWriter.java 1 Nov 2004 17:26:57 -0000 1.58
+++ ClientStubWriter.java 4 Nov 2004 10:42:33 -0000 1.59
@@ -619,13 +619,19 @@
}
}
writer.write("\t\t\t}\n");
- writer.write("\t\t}\n\t\tm_pCall->unInitialize();\n");
+ writer.write("\t\t}\n");
+ writer.write("\tupdateStateAfterResponse();\n");
+ writer.write("\tm_pCall->unInitialize();\n");
+ //writer.write("\t\t}\n\t\tm_pCall->unInitialize();\n");
}
else
if (returntype == null)
{
writer.write("\t\t\t/*not successful*/\n\t\t}\n");
- writer.write("\t\t}\n\t\tm_pCall->unInitialize();\n");
+ writer.write("\t\t}\n");
+ writer.write("\tupdateStateAfterResponse();\n");
+ writer.write("\tm_pCall->unInitialize();\n");
+ // writer.write("\t\t}\n\t\tm_pCall->unInitialize();\n");
}
else
if (returntypeisarray)
@@ -666,7 +672,10 @@
+ containedType
+ ");\n\t\t\t}\n");
}
- writer.write("\t\t}\n\t\tm_pCall->unInitialize();\n");
+ writer.write("\t\t}\n");
+ writer.write("\tupdateStateAfterResponse();\n");
+ writer.write("\tm_pCall->unInitialize();\n");
+ // writer.write("\t\t}\n\t\tm_pCall->unInitialize();\n");
writer.write("\t\treturn RetArray;\n");
}
else
@@ -680,7 +689,10 @@
+ "(\""
+ returntype.getParamName()
+ "\", 0);\n\t\t\t}\n");
- writer.write("\t\t}\n\t\tm_pCall->unInitialize();\n");
+ writer.write("\t\t}\n");
+ writer.write("\tupdateStateAfterResponse();\n");
+ writer.write("\tm_pCall->unInitialize();\n");
+ // writer.write("\t\t}\n\t\tm_pCall->unInitialize();\n");
writer.write("\t\treturn Ret;\n");
}
else
@@ -699,7 +711,10 @@
+ ",\""
+ returntype.getParamName()
+ "\", 0);\n\t\t}\n");
- writer.write("\t\t}\n\t\tm_pCall->unInitialize();\n");
+ writer.write("\t\t}\n");
+ writer.write("\tupdateStateAfterResponse();\n");
+ writer.write("\tm_pCall->unInitialize();\n");
+ // writer.write("\t\t}\n\t\tm_pCall->unInitialize();\n");
writer.write("\t\treturn pReturn;\n");
}
@@ -710,7 +725,9 @@
writer.write(
"\t\tif(AXISC_NODE_VALUE_MISMATCH_EXCEPTION != iExceptionCode)\n");
writer.write("\t\t{\n");
- writer.write("\t\t\tm_pCall->unInitialize();\n");
+ writer.write("\tupdateStateAfterResponse();\n");
+ writer.write("\tm_pCall->unInitialize();\n");
+ //writer.write("\t\t\tm_pCall->unInitialize();\n");
writer.write(
"\t\t\tthrow "
+ wscontext.getSerInfo().getServicename()
@@ -735,7 +752,9 @@
int j = 0;
if (!paramsFault.hasNext())
{
- writer.write("\t\t\tm_pCall->unInitialize();\n");
+ writer.write("\tupdateStateAfterResponse();\n");
+ writer.write("\tm_pCall->unInitialize();\n");
+ //writer.write("\t\t\tm_pCall->unInitialize();\n");
writer.write(
"\t\t\tthrow "
+ wscontext.getSerInfo().getServicename()
@@ -786,6 +805,8 @@
if (flag == true)
{
writer.write("\t\t\telse\n\t\t\t{\n");
+ writer.write("\tupdateStateAfterResponse();\n");
+ writer.write("\tm_pCall->unInitialize();\n");
writer.write("\t\t\t\t m_pCall->unInitialize();\n");
writer.write(
"\t\t\t\t throw "
@@ -828,7 +849,9 @@
+ "\", 0);\n");
writer.write(
"\t\t\t\t\tpSoapFault->setCmplxFaultObject(pFaultDetail);\n");
- writer.write("\t\t\t\t\tm_pCall->unInitialize();\n");
+ writer.write("\tupdateStateAfterResponse();\n");
+ writer.write("\tm_pCall->unInitialize();\n");
+ //writer.write("\t\t\t\t\tm_pCall->unInitialize();\n");
writer.write(
"\t\t\t\t\tthrow "
+ wscontext.getSerInfo().getServicename()
1.51 +32 -9 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
Index: ClientStubWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ClientStubWriter.java 3 Nov 2004 13:09:37 -0000 1.50
+++ ClientStubWriter.java 4 Nov 2004 10:42:33 -0000 1.51
@@ -871,7 +871,9 @@
}
}
writer.write("\t\t}\n");
- writer.write("\t}\n\tm_pCall->unInitialize();\n");
+ writer.write("\t}\n");
+ writer.write("\tupdateStateAfterResponse();\n");
+ writer.write("\tm_pCall->unInitialize();\n");
}
else
{
@@ -881,7 +883,10 @@
{
writer.write("\t\t\t/*not successful*/\n\t\t}\n");
}
- writer.write("\t}\n\tm_pCall->unInitialize();\n");
+ writer.write("\t}\n");
+ writer.write("\tupdateStateAfterResponse();\n");
+ writer.write("\tm_pCall->unInitialize();\n");
+ //writer.write("\t}\n\tm_pCall->unInitialize();\n");
}
else
{
@@ -924,7 +929,10 @@
+ containedType
+ ");\n\t\t}\n");
}
- writer.write("\t}\n\tm_pCall->unInitialize();\n");
+ writer.write("\t}\n");
+ writer.write("\tupdateStateAfterResponse();\n");
+ writer.write("\tm_pCall->unInitialize();\n");
+ // writer.write("\t}\n\tm_pCall->unInitialize();\n");
writer.write("\treturn RetArray;\n");
}
else
@@ -940,7 +948,10 @@
+ "(\""
+ returntype.getParamName()
+ "\", 0);\n\t\t}\n");
- writer.write("\t}\n\tm_pCall->unInitialize();\n");
+ writer.write("\t}\n");
+ writer.write("\tupdateStateAfterResponse();\n");
+ writer.write("\tm_pCall->unInitialize();\n");
+ // writer.write("\t}\n\tm_pCall->unInitialize();\n");
writer.write("\treturn Ret;\n");
}
else
@@ -953,7 +964,10 @@
"\t\t\tpReturn = ("
+ outparamType
+ "*)m_pCall->getAnyObject();\n\t\t}\n");
- writer.write("\t}\n\tm_pCall->unInitialize();\n");
+ writer.write("\t}\n");
+ writer.write("\tupdateStateAfterResponse();\n");
+ writer.write("\tm_pCall->unInitialize();\n");
+ // writer.write("\t}\n\tm_pCall->unInitialize();\n");
writer.write("\treturn pReturn;\n");
}
else
@@ -973,7 +987,10 @@
+ returntype.getElementNameAsString()
+ "\", 0);\n\t\t}\n");
//Samisa
- writer.write("\t}\n\tm_pCall->unInitialize();\n");
+ writer.write("\t}\n");
+ writer.write("\tupdateStateAfterResponse();\n");
+ writer.write("\tm_pCall->unInitialize();\n");
+ // writer.write("\t}\n\tm_pCall->unInitialize();\n");
writer.write("\treturn pReturn;\n");
}
}
@@ -1010,7 +1027,9 @@
int j = 0;
if (!paramsFault.hasNext())
{
- writer.write("\t\t\tm_pCall->unInitialize();\n");
+ writer.write("\tupdateStateAfterResponse();\n");
+ writer.write("\tm_pCall->unInitialize();\n");
+ //writer.write("\t\t\tm_pCall->unInitialize();\n");
writer.write(
"\t\t\tthrow "
+ wscontext.getSerInfo().getServicename()
@@ -1085,7 +1104,9 @@
if (flag == true)
{
writer.write("\t\t\telse\n\t\t\t{\n");
- writer.write("\t\t\t\t m_pCall->unInitialize();\n");
+ writer.write("\tupdateStateAfterResponse();\n");
+ writer.write("\tm_pCall->unInitialize();\n");
+ //writer.write("\t\t\t\t m_pCall->unInitialize();\n");
writer.write(
"\t\t\t\t throw "
+ wscontext.getSerInfo().getServicename()
@@ -1126,7 +1147,9 @@
+ "\", 0);\n");
writer.write(
"\t\t\t\tpSoapFault->setCmplxFaultObject(pFaultDetail);\n");
- writer.write("\t\t\t\tm_pCall->unInitialize();\n");
+ writer.write("\tupdateStateAfterResponse();\n");
+ writer.write("\tm_pCall->unInitialize();\n");
+ //writer.write("\t\t\t\tm_pCall->unInitialize();\n");
writer.write(
"\t\t\t\tthrow "
+ wscontext.getSerInfo().getServicename()