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/20 10:12:19 UTC
cvs commit: ws-axis/c/src/wsdd AxisWsddException.cpp
damitha 2004/05/20 01:12:19
Modified: c/include/axis/server AxisException.h
c/src/common AxisConfigException.cpp AxisException.cpp
c/src/engine AxisEngineException.cpp
c/src/engine/server ServerAxisEngine.cpp
c/src/soap AxisSoapException.cpp
c/src/wsdd AxisWsddException.cpp
Log:
Revision Changes Path
1.11 +1 -0 ws-axis/c/include/axis/server/AxisException.h
Index: AxisException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/server/AxisException.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AxisException.h 20 May 2004 03:48:03 -0000 1.10
+++ AxisException.h 20 May 2004 08:12:18 -0000 1.11
@@ -145,6 +145,7 @@
SERVER_UNKNOWN_ERROR,
/*Following exceptions are not releated to soap faults
*/
+ AXISC_SERVICE_THROWN_EXCEPTION,
AXISC_UNKNOWN_ELEMENT_EXCEPTION,
AXISC_NODEVALUE_MISMATCH_EXCEPTION,
1.3 +1 -0 ws-axis/c/src/common/AxisConfigException.cpp
Index: AxisConfigException.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisConfigException.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AxisConfigException.cpp 18 May 2004 04:32:30 -0000 1.2
+++ AxisConfigException.cpp 20 May 2004 08:12:18 -0000 1.3
@@ -45,6 +45,7 @@
AxisConfigException::AxisConfigException (exception* e, int iExceptionCode)
{
+ m_iExceptionCode = iExceptionCode;
processException (e, iExceptionCode);
}
1.18 +4 -0 ws-axis/c/src/common/AxisException.cpp
Index: AxisException.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisException.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- AxisException.cpp 20 May 2004 03:48:03 -0000 1.17
+++ AxisException.cpp 20 May 2004 08:12:18 -0000 1.18
@@ -36,6 +36,7 @@
AxisException::AxisException (exception* e, int iExceptionCode)
{
+ m_iExceptionCode = iExceptionCode;
processException (e, iExceptionCode);
}
@@ -66,6 +67,9 @@
string sMessage;
switch(iExceptionCode)
{
+ case AXISC_SERVICE_THROWN_EXCEPTION:
+ sMessage = "A service has thrown an exception. see detail";
+ break;
case SERVER_TESTEXCEPTION:
sMessage = "This is a testing error";
break;
1.3 +1 -0 ws-axis/c/src/engine/AxisEngineException.cpp
Index: AxisEngineException.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/AxisEngineException.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AxisEngineException.cpp 18 May 2004 04:32:30 -0000 1.2
+++ AxisEngineException.cpp 20 May 2004 08:12:18 -0000 1.3
@@ -45,6 +45,7 @@
AxisEngineException::AxisEngineException (exception* e, int iExceptionCode)
{
+ m_iExceptionCode = iExceptionCode;
processException (e, iExceptionCode);
}
1.12 +7 -3 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ServerAxisEngine.cpp 18 May 2004 04:32:31 -0000 1.11
+++ ServerAxisEngine.cpp 20 May 2004 08:12:18 -0000 1.12
@@ -333,10 +333,14 @@
*/
//m_pSZ->setSoapFault (SoapFault::getSoapFault (CLIENT_SOAP_SOAPCONTENTERROR));
#ifdef ENABLE_AXIS_EXCEPTION
+ int iExceptionCode = e.getExceptionCode();
char* tempStr = (char*) e.what();
- AXISTRACE2("Error:", tempStr, CRITICAL);
- if(strcmp(tempStr, ""))
- return AXIS_SUCCESS;
+ AXISTRACE2("Exception:", tempStr, CRITICAL);
+ if(AXISC_SERVICE_THROWN_EXCEPTION == iExceptionCode)
+ {
+ return AXIS_SUCCESS;//Service created fault is written to the stream.
+ //so return success.
+ }
else
return e.getExceptionCode();
#endif
1.4 +1 -0 ws-axis/c/src/soap/AxisSoapException.cpp
Index: AxisSoapException.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/AxisSoapException.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AxisSoapException.cpp 20 May 2004 03:48:03 -0000 1.3
+++ AxisSoapException.cpp 20 May 2004 08:12:18 -0000 1.4
@@ -45,6 +45,7 @@
AxisSoapException::AxisSoapException (exception* e, int iExceptionCode)
{
+ m_iExceptionCode = iExceptionCode;
processException (e, iExceptionCode);
}
1.3 +1 -0 ws-axis/c/src/wsdd/AxisWsddException.cpp
Index: AxisWsddException.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/AxisWsddException.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AxisWsddException.cpp 18 May 2004 04:32:32 -0000 1.2
+++ AxisWsddException.cpp 20 May 2004 08:12:18 -0000 1.3
@@ -45,6 +45,7 @@
AxisWsddException::AxisWsddException (exception* e, int iExceptionCode)
{
+ m_iExceptionCode = iExceptionCode;
processException (e, iExceptionCode);
}