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 da...@apache.org on 2004/05/26 08:27:16 UTC
cvs commit: ws-axis/c/src/soap SoapBody.cpp SoapDeSerializer.cpp SoapSerializer.cpp
damitha 2004/05/25 23:27:16
Modified: c/samples/client/rpcfault MathOps.cpp
c/src/engine/server ServerAxisEngine.cpp
c/src/soap SoapBody.cpp SoapDeSerializer.cpp
SoapSerializer.cpp
Log:
Revision Changes Path
1.7 +0 -8 ws-axis/c/samples/client/rpcfault/MathOps.cpp
Index: MathOps.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/rpcfault/MathOps.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MathOps.cpp 24 May 2004 05:44:19 -0000 1.6
+++ MathOps.cpp 26 May 2004 06:27:16 -0000 1.7
@@ -77,19 +77,11 @@
if(AXIS_SUCCESS == m_pCall->checkFault("faultdetail",
"http://localhost/axis/MathOps"))
{
- printf("came\n");
m_pCall->getFaultDetail(&cFaultdetail);
- printf("came1\n");
throw AxisException(cFaultdetail);
}
else
{
- //cFaultdetail = m_pCall->getElementAsString("faultdetail", 0);
- //if(NULL != cFaultdetail)
- //{
- // printf("came1\n");
- // throw AxisException(cFaultdetail);
- //}
SOAPStructFault* pFaultDetail = NULL;
pFaultDetail = (SOAPStructFault*)m_pCall->
getCmplxObject((void*) Axis_DeSerialize_SOAPStructFault,
1.17 +0 -4 ws-axis/c/src/engine/server/ServerAxisEngine.cpp
Index: ServerAxisEngine.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/server/ServerAxisEngine.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ServerAxisEngine.cpp 25 May 2004 08:17:30 -0000 1.16
+++ ServerAxisEngine.cpp 26 May 2004 06:27:16 -0000 1.17
@@ -493,13 +493,9 @@
string sMessage = objMessage.getMessage(iFaultCode);
SoapFault* pObjSoapFault = SoapFault::getSoapFault(iFaultCode);
pObjSoapFault->setFaultDetail(sMessage);
- AXISTRACE1("came70", INFO);
m_pSZ->setSoapFault(pObjSoapFault);
- AXISTRACE1("came71", INFO);
m_pSZ->setOutputStream(pStream);
- AXISTRACE1("came72", INFO);
releaseHandlers(pStream);
- AXISTRACE1("came73", INFO);
return AXIS_SUCCESS;
}
1.21 +0 -5 ws-axis/c/src/soap/SoapBody.cpp
Index: SoapBody.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapBody.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- SoapBody.cpp 24 May 2004 05:44:20 -0000 1.20
+++ SoapBody.cpp 26 May 2004 06:27:16 -0000 1.21
@@ -71,7 +71,6 @@
do
{
- AXISTRACE1("came5", INFO);
pSZ.serialize("<", gs_SoapEnvVersionsStruct[eSoapVersion].pchPrefix,
":", gs_SoapEnvVersionsStruct[eSoapVersion].pchWords[SKW_BODY],
NULL);
@@ -85,17 +84,14 @@
if(NULL != m_pSoapFault)
{
- AXISTRACE1("came6", INFO);
iStatus= m_pSoapFault->serialize(pSZ);
if(iStatus==AXIS_FAIL)
{
- AXISTRACE1("came7", INFO);
break;
}
}
else if(NULL != m_pSoapMethod)
{
- AXISTRACE1("came8", INFO);
iStatus= m_pSoapMethod->serialize(pSZ);
if(iStatus==AXIS_FAIL)
{
@@ -112,7 +108,6 @@
break;
}
}
- AXISTRACE1("came9", INFO);
pSZ.serialize("</", gs_SoapEnvVersionsStruct[eSoapVersion].pchPrefix,
":", gs_SoapEnvVersionsStruct[eSoapVersion].pchWords[SKW_BODY],
1.52 +3 -35 ws-axis/c/src/soap/SoapDeSerializer.cpp
Index: SoapDeSerializer.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapDeSerializer.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- SoapDeSerializer.cpp 25 May 2004 08:17:30 -0000 1.51
+++ SoapDeSerializer.cpp 26 May 2004 06:27:16 -0000 1.52
@@ -291,8 +291,6 @@
if (AXIS_SUCCESS != getBody()) return AXIS_FAIL;
if (!m_pNode) m_pNode = m_pParser->next();
if (!m_pNode || (START_ELEMENT != m_pNode->m_type)) return AXIS_FAIL;
- AXISTRACE2("pName", pName, INFO);
- AXISTRACE2("m_pChNameOrValue", m_pNode->m_pchNameOrValue, INFO);
//if (0 != strcmp(m_pNode->m_pchNameOrValue, pName)) return AXIS_FAIL;
if (0 != strcmp(m_pNode->m_pchNameOrValue, pName))
{
@@ -310,8 +308,6 @@
//if (!m_pNode || (START_ELEMENT != m_pNode->m_type)) return AXIS_FAIL;
if(0 == strcmp("Fault", pName))
{
- AXISTRACE2("pName", pName, INFO);
- AXISTRACE2("m_pChNameOrValue", m_pNode->m_pchNameOrValue, INFO);
if (0 != strcmp(m_pNode->m_pchNameOrValue, pName))
{
m_nStatus = AXIS_SUCCESS;
@@ -325,22 +321,6 @@
}
else
{
- AXISTRACE1("came50", INFO);
- /*m_pNode = m_pParser->next();
- AXISTRACE2("came50,Node type:", m_pNode->m_type, INFO);
- if (!m_pNode || (START_ELEMENT != m_pNode->m_type)) return AXIS_FAIL;
- AXISTRACE2("pName", pName, INFO);
- AXISTRACE2("m_pChNameOrValue", m_pNode->m_pchNameOrValue, INFO);
- if (0 != strcmp(m_pNode->m_pchNameOrValue, pName))
- {
- m_nStatus = AXIS_SUCCESS;
- m_pNode = NULL;
- THROW_AXIS_EXCEPTION(AXISC_NODEVALUE_MISMATCH_EXCEPTION);
- }
- m_nStatus = AXIS_SUCCESS;
- m_pNode = NULL;
- return AXIS_SUCCESS;
- */
char* tempChar = getElementAsString("faultdetail", 0);
if(0 == tempChar)
{
@@ -363,7 +343,6 @@
//if (!m_pNode) m_pNode = m_pParser->next();
//if (m_pNode)
//{
- AXISTRACE1("SOAP FAULT", INFO);
m_pcFaultDetail = "This is a hard coded test error";
return AXIS_SUCCESS;
@@ -967,7 +946,6 @@
void* pDelFunct, const AxisChar* pName,
const AxisChar* pNamespace)
{
- AXISTRACE1("came20", INFO);
if (AXIS_SUCCESS != m_nStatus) return NULL;
/* if anything has gone wrong earlier just do nothing */
if (RPC_ENCODED == m_nStyle)
@@ -978,10 +956,9 @@
if (!m_pNode) return NULL;
/* type can be checked here */
void* pObject = ((AXIS_OBJECT_CREATE_FUNCT)pCreFunct)(NULL, false, 0);
- AXISTRACE1("came21", INFO);
if (pObject && pDZFunct)
{
- AXISTRACE1("came22", INFO);
+ AXISTRACE1("came1", INFO);
if (C_RPC_PROVIDER == getCurrentProviderType())
{
IWrapperSoapDeSerializer_C cWSD;
@@ -991,13 +968,12 @@
}
else
{
- AXISTRACE1("came23", INFO);
+ AXISTRACE1("came2", INFO);
m_nStatus = ((AXIS_DESERIALIZE_FUNCT)pDZFunct)(pObject, this);
- AXISTRACE1("came24", INFO);
}
if (AXIS_SUCCESS == m_nStatus)
{
- AXISTRACE1("came25", INFO);
+ AXISTRACE1("came3", INFO);
m_pParser->next(); /* skip end node too */
return pObject;
}
@@ -1006,7 +982,6 @@
((AXIS_OBJECT_DELETE_FUNCT)pDelFunct)(pObject, false, 0);
}
}
- AXISTRACE1("came26", INFO);
}
else
{
@@ -2195,25 +2170,18 @@
AxisChar* SoapDeSerializer::getElementAsString(const AxisChar* pName,
const AxisChar* pNamespace)
{
- AXISTRACE2("pName:", pName, INFO);
AxisChar* ret = 0;
if (AXIS_SUCCESS != m_nStatus) return ret;
- AXISTRACE1("came30", INFO);
if (RPC_ENCODED == m_nStyle)
{
- AXISTRACE1("came31", INFO);
m_pNode = m_pParser->next();
/* wrapper node with type info Ex: <i xsi:type="xsd:int"> */
if (!m_pNode) return ret;
- AXISTRACE1("came32", INFO);
if (XSD_STRING == getXSDType(m_pNode))
{
- AXISTRACE1("came33", INFO);
m_pNode = m_pParser->next(true); /* charactor node */
- AXISTRACE1("came34", INFO);
if (m_pNode && (CHARACTER_ELEMENT == m_pNode->m_type))
{
- AXISTRACE1("came35", INFO);
ret = strdup(m_pNode->m_pchNameOrValue);
/* this is because the string may not be available later */
m_pNode = m_pParser->next(); /* skip end element node too */
1.49 +0 -4 ws-axis/c/src/soap/SoapSerializer.cpp
Index: SoapSerializer.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapSerializer.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- SoapSerializer.cpp 24 May 2004 05:44:20 -0000 1.48
+++ SoapSerializer.cpp 26 May 2004 06:27:16 -0000 1.49
@@ -206,7 +206,6 @@
void* pDelFunct, const AxisChar* pName,
const AxisChar* pNamespace )
{
- AXISTRACE1("came1", INFO);
Param* pParam = new Param();
pParam->m_Value.pCplxObj = new ComplexObjectHandler;
pParam->m_Value.pCplxObj->pObject = pObject;
@@ -215,7 +214,6 @@
if(m_pSoapEnvelope && (m_pSoapEnvelope->m_pSoapBody) && (m_pSoapEnvelope->
m_pSoapBody->m_pSoapFault))
{
- AXISTRACE1("came2", INFO);
m_pSoapEnvelope->m_pSoapBody->m_pSoapFault->setFaultDetail(pParam);
}
pParam->setName(pName);
@@ -224,7 +222,6 @@
int SoapSerializer::setSoapFault(SoapFault *pSoapFault)
{
- AXISTRACE1("came3", INFO);
int intStatus= AXIS_FAIL;
if(m_pSoapEnvelope && (m_pSoapEnvelope->m_pSoapBody))
@@ -448,7 +445,6 @@
int SoapSerializer::createSoapFault(const AxisChar* sLocalName,
const AxisChar* sURI)
{
- AXISTRACE1("came4", INFO);
SoapFault* pSoapFault = new SoapFault();
setSoapFault(pSoapFault);
pSoapFault->setLocalName(sLocalName);