svn commit: r1074397 - /axis/axis1/c/trunk/src/engine/client/Call.cpp

[nadiramra]

Author: nadiramra
Date: Fri Feb 25 04:22:17 2011
New Revision: 1074397

URL: http://svn.apache.org/viewvc?rev=1074397&view=rev
Log:
Minor - for C clients, show SOAP fault in exception message instead of generic 
message

Modified:
    axis/axis1/c/trunk/src/engine/client/Call.cpp

Modified: axis/axis1/c/trunk/src/engine/client/Call.cpp
URL: 
http://svn.apache.org/viewvc/axis/axis1/c/trunk/src/engine/client/Call.cpp?rev=1074397&r1=1074396&r2=1074397&view=diff
==============================================================================
--- axis/axis1/c/trunk/src/engine/client/Call.cpp (original)
+++ axis/axis1/c/trunk/src/engine/client/Call.cpp Fri Feb 25 04:22:17 2011
@@ -1237,9 +1237,18 @@ void Call::processSoapFault(AxisExceptio
     AXIS_EXCEPTION_HANDLER_FUNCT excFp = 
(AXIS_EXCEPTION_HANDLER_FUNCT)exceptionHandlerFp;
     ISoapFault* pSoapFault             = NULL;
     
-    if (AXISC_NODE_VALUE_MISMATCH_EXCEPTION == e->getExceptionCode() 
-            && m_pSoapFaultNamespace != NULL)
-        pSoapFault = (ISoapFault*) this->checkFault("Fault", 
m_pSoapFaultNamespace);
+    if (AXISC_NODE_VALUE_MISMATCH_EXCEPTION == e->getExceptionCode())
+    {
+        try
+        {
+            pSoapFault = (ISoapFault*) this->checkFault("Fault", 
m_pSoapFaultNamespace);
+        }
+        catch (AxisException& e1)
+        {
+            // Just fall through since we are already dealing with some 
exception.
+            pSoapFault = NULL;
+        }
+    }
 
     if(pSoapFault)
     {
@@ -1285,7 +1294,30 @@ void Call::processSoapFault(AxisExceptio
             }
         }
         
-        excFp(e->getExceptionCode(), e->what(), pSoapFault, pFaultDetail);
+        // Generate an appropriate error message
+        std::string faultExcMsg = "AxisSoapException: SOAP fault occurred: \n";
+        faultExcMsg += "faultcode  : ";
+        faultExcMsg += pSoapFault->getFaultcode();
+        faultExcMsg += "\n";
+        faultExcMsg += "faultstring: ";
+        faultExcMsg += pSoapFault->getFaultstring();
+        faultExcMsg += "\n";
+        faultExcMsg += "faultactor : ";
+        faultExcMsg += pSoapFault->getFaultactor();
+        faultExcMsg += "\n";
+
+        // Ensure error code is set correctly for certain fault codes
+        const AxisChar* faultCode = pSoapFault->getFaultcode();
+        int faultExcCode = e->getExceptionCode();
+        if (faultCode)
+        {
+            if (strcmp(faultCode, "VersionMismatch") == 0)
+                faultExcCode = SOAP_VERSION_MISMATCH;
+            else if (strcmp(faultCode, "MustUnderstand") == 0)
+                faultExcCode = SOAP_MUST_UNDERSTAND;
+        }
+
+        excFp(faultExcCode, faultExcMsg.c_str(), pSoapFault, pFaultDetail);
         
         if (faultIsDefined)
         {
@@ -1313,4 +1345,4 @@ void Call::resetSoapFaultList()
         it++;
     }
     m_soapFaults.clear();
-}
\ No newline at end of file
+}