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 na...@apache.org on 2006/05/26 02:39:37 UTC

svn commit: r409521 [4/4] - in /webservices/axis/trunk/c: include/axis/ include/axis/client/ src/cbindings/ src/cbindings/client/ src/engine/client/ src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ tests/auto_bu...

Modified: webservices/axis/trunk/c/src/cbindings/client/StubC.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/cbindings/client/StubC.cpp?rev=409521&r1=409520&r2=409521&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/cbindings/client/StubC.cpp (original)
+++ webservices/axis/trunk/c/src/cbindings/client/StubC.cpp Thu May 25 17:39:36 2006
@@ -20,8 +20,6 @@
 #include <axis/client/Stub.hpp>
 #include <axis/AxisException.hpp>
 
-#include "../AxisObjectContainer.hpp"
-
 #include <axis/Axis.h>
 #include <axis/GDefine.h>
 #include <axis/AxisUserAPI.h>
@@ -51,16 +49,15 @@
     try
     {
         StubC *stub = new StubC(pcEndPointURI, (AXIS_PROTOCOL_TYPE)eProtocol);
-        AxisObjectContainer *h = new AxisObjectContainer(stub);
-        return (AXISCHANDLE)h;
+        return (AXISCHANDLE)stub;
     }
     catch ( AxisException& e  )
     {
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
     
     return (AXISCHANDLE)NULL;
@@ -72,21 +69,19 @@
 	if ((AXISCHANDLE)NULL == stub)
 		return;
 			
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    StubC *s = (StubC*)h->_objHandle;
+    StubC *s = (StubC*)stub;
     
     try
     {
-        delete h;
         delete s;
     }
     catch ( AxisException& e  )
     {
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 }
 
@@ -94,9 +89,9 @@
 void axiscStubSetEndPoint(AXISCHANDLE stub, 
                       const char * pcEndPointURI) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
     
     try
     {
@@ -104,14 +99,14 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 }
 
@@ -120,9 +115,9 @@
                                    const char * pcKey, 
                                    const char * pcValue) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
     
     try
     {
@@ -130,14 +125,14 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 }
 
@@ -146,9 +141,9 @@
                                            const char *key, 
                                            AxiscBool response) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
     
     try
     {
@@ -156,14 +151,14 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 
     return (const char *)NULL;
@@ -173,9 +168,9 @@
 const char * axiscStubGetFirstTransportPropertyKey(AXISCHANDLE stub, 
                                                AxiscBool response) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
     
     try
     {
@@ -183,14 +178,14 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
     
     return (const char *)NULL;
@@ -200,9 +195,9 @@
 const char * axiscStubGetNextTransportPropertyKey(AXISCHANDLE stub, 
                                               AxiscBool response) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
     
     try
     {
@@ -210,14 +205,14 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 
     return (const char *)NULL;
@@ -227,9 +222,9 @@
 const char * axiscStubGetCurrentTransportPropertyKey(AXISCHANDLE stub, 
                                                  AxiscBool response) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
     
     try
     {
@@ -237,14 +232,14 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 
     return (const char *)NULL;    
@@ -254,9 +249,9 @@
 const char * axiscStubGetCurrentTransportPropertyValue(AXISCHANDLE stub, 
                                                    AxiscBool response) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
 
     try
     {
@@ -264,14 +259,14 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 
     return (const char *)NULL;    
@@ -281,9 +276,9 @@
 void axiscStubDeleteCurrentTransportProperty(AXISCHANDLE stub, 
                                          AxiscBool response) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
     
     try
     {
@@ -291,14 +286,14 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 }
 
@@ -307,9 +302,9 @@
                                   char * pcKey, 
                                   unsigned int uiOccurance) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
 
     try
     {
@@ -317,14 +312,14 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 }
 
@@ -334,9 +329,9 @@
                                  void * value, 
                                  int len) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
 
     try
     {
@@ -344,14 +339,14 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 }
 
@@ -361,9 +356,9 @@
                                        AxiscChar * pachUri, 
                                        AxiscChar * pachPrefix) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
     
     try
     {
@@ -374,14 +369,14 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 
     return (AXISCHANDLE)NULL;
@@ -390,9 +385,9 @@
 AXISC_STORAGE_CLASS_INFO 
 AXISCHANDLE axiscStubGetFirstSOAPHeaderBlock(AXISCHANDLE stub) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
     
     try
     {
@@ -400,14 +395,14 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 
     return (AXISCHANDLE)NULL;    
@@ -416,9 +411,9 @@
 AXISC_STORAGE_CLASS_INFO 
 AXISCHANDLE axiscStubGetNextSOAPHeaderBlock(AXISCHANDLE stub) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
     
     try
     {
@@ -426,14 +421,14 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 
     return (AXISCHANDLE)NULL;    
@@ -442,9 +437,9 @@
 AXISC_STORAGE_CLASS_INFO 
 AXISCHANDLE axiscStubGetCurrentSOAPHeaderBlock(AXISCHANDLE stub) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
     
     try
     {
@@ -452,14 +447,14 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 
     return (AXISCHANDLE)NULL;    
@@ -468,9 +463,9 @@
 AXISC_STORAGE_CLASS_INFO 
 void axiscStubDeleteCurrentSOAPHeaderBlock(AXISCHANDLE stub) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
     
     try
     {
@@ -478,23 +473,23 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 }
 
 AXISC_STORAGE_CLASS_INFO 
 void axiscStubDeleteSOAPHeaderBlock(AXISCHANDLE stub, AXISCHANDLE pHeaderBlock) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
     
     try
     {
@@ -502,14 +497,14 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 }
 
@@ -518,9 +513,9 @@
                        const char * pcProxyHost, 
                        unsigned int uiProxyPort) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
     
     try
     {
@@ -528,14 +523,14 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 }
 
@@ -543,9 +538,9 @@
 void axiscStubSetTransportTimeout(AXISCHANDLE stub, 
                               long lSeconds) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
     
     try
     {
@@ -553,23 +548,23 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 }
 
 AXISC_STORAGE_CLASS_INFO 
 int axiscStubGetStatus(AXISCHANDLE stub) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
     
     try
     {
@@ -577,14 +572,14 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 
     return -1;
@@ -594,9 +589,9 @@
 void axiscStubSetMaintainSession(AXISCHANDLE stub, 
                              AxiscBool bSession) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
     
     try
     {
@@ -604,14 +599,14 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 }
 
@@ -619,9 +614,9 @@
 void axiscStubSetTransportProtocol(AXISCHANDLE stub, 
                                AXISC_PROTOCOL_TYPE eProtocol) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
     
     try
     {
@@ -629,23 +624,23 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 }
 
 AXISC_STORAGE_CLASS_INFO 
 AXISC_PROTOCOL_TYPE axiscStubGetTransportProtocol(AXISCHANDLE stub) 
 {
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    Stub *s = (Stub*)h->_objHandle;
+    
+    
+    Stub *s = (Stub*)stub;
     
     try
     {
@@ -653,14 +648,14 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
     
     return (AXISC_PROTOCOL_TYPE)-1;
@@ -669,26 +664,26 @@
 AXISC_STORAGE_CLASS_INFO 
 AXISCHANDLE axiscStubGetCall(AXISCHANDLE stub) 
 { 
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    StubC *s = (StubC*)h->_objHandle;
+    
+    
+    StubC *s = (StubC*)stub;
     
     try
     {
-        AxisObjectContainer *newH = new AxisObjectContainer(s->getCallStubC());
-
-        return (AXISCHANDLE)newH;
+        Call *c = s->getCallStubC();
+        c->setCStub(s);
+        return (AXISCHANDLE)c;
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 
     return (AXISCHANDLE)NULL;    
@@ -697,9 +692,9 @@
 AXISC_STORAGE_CLASS_INFO 
 void axiscStubApplyUserPreferences(AXISCHANDLE stub) 
 { 
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    StubC *s = (StubC*)h->_objHandle;
+    
+    
+    StubC *s = (StubC*)stub;
     
     try
     {
@@ -707,22 +702,22 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 }
 AXISC_STORAGE_CLASS_INFO 
 void axiscStubIncludeSecure(AXISCHANDLE stub)
 { 
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    StubC *s = (StubC*)h->_objHandle;
+    
+    
+    StubC *s = (StubC*)stub;
     
     try
     {
@@ -730,23 +725,23 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 }
 
 AXISC_STORAGE_CLASS_INFO 
 void axiscStubSetSOAPHeaders(AXISCHANDLE stub) 
 { 
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    StubC *s = (StubC*)h->_objHandle;
+    
+    
+    StubC *s = (StubC*)stub;
     
     try
     {
@@ -754,14 +749,14 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 }
 
@@ -771,9 +766,9 @@
                         char * pszArguments, 
                         ... )
 { 
-    AxisObjectContainer *h = (AxisObjectContainer *)stub;
-    h->_exception.resetException();
-    StubC *s = (StubC*)h->_objHandle;
+    
+    
+    StubC *s = (StubC*)stub;
     
     try
     {
@@ -785,14 +780,14 @@
     }
     catch ( AxisException& e  )
     {
-        h->_exception.setExceptionFromException(e);
-        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL);
     }
     catch ( ... )
     {
-        h->_exception.setExceptionCode(-1);  
-        h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+          
+          
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL);
     }
 }
 

Modified: webservices/axis/trunk/c/src/engine/client/Call.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/engine/client/Call.cpp?rev=409521&r1=409520&r2=409521&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/client/Call.cpp (original)
+++ webservices/axis/trunk/c/src/engine/client/Call.cpp Thu May 25 17:39:36 2006
@@ -42,7 +42,7 @@
 
 Call::Call ()
 :m_pcEndPointUri(NULL), m_strProxyHost(""), m_uiProxyPort(0), m_bUseProxy(false),
-m_bCallInitialized(false), m_pContentIdSet(NULL)
+m_bCallInitialized(false), m_pContentIdSet(NULL), m_pStub(NULL), m_pExceptionHandler(NULL)
 {
     m_pAxisEngine = NULL;
     m_pIWSSZ = NULL;

Modified: webservices/axis/trunk/c/src/engine/client/Stub.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/engine/client/Stub.cpp?rev=409521&r1=409520&r2=409521&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/client/Stub.cpp (original)
+++ webservices/axis/trunk/c/src/engine/client/Stub.cpp Thu May 25 17:39:36 2006
@@ -35,7 +35,8 @@
 m_pcUsername (NULL),
 m_pcPassword (NULL),
 m_proxyUsername (NULL),
-m_proxyPassword (NULL)
+m_proxyPassword (NULL), 
+m_pExceptionHandler(NULL)
 {
     m_pCall = new Call ();
     m_pCall->setProtocol (eProtocol);

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java?rev=409521&r1=409520&r2=409521&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java Thu May 25 17:39:36 2006
@@ -444,10 +444,48 @@
         for (int i = 0; i < attribs.length; i++)
         {       
             //if the attribute is a 'choice' construct we have to peek and make
-            // the choice - TODO
+            // the choice
 
+            if (attribs[i].getChoiceElement())
+            {
+                if (!peekCalled)
+                {
+                    writer.write("\tconst char* choiceName=axiscSoapDeSerializerPeekNextElementName(pDZ);\n");
+                    peekCalled = true;
+                }
+
+                if (!firstIfWritten)
+                {
+                    writer.write("\tif");
+                    firstIfWritten = true;
+                } 
+                else
+                    writer.write("\telse if");
+
+                writer.write("(strcmp(choiceName,\""
+                        + attribs[i].getElementNameAsString() + "\")==0)\n\t{\n\t");
+            }
+            
             //if the attribute is a 'all' construct we have to check Min
-            // occures TODO
+            // occures
+            if (attribs[i].getAllElement())
+                if (attribs[i].getMinOccurs() == 0)
+                {
+                    if (!foundAll)
+                    {
+                        writer.write("\tconst char* allName = NULL;\n");
+                        writer.write("\tAxiscBool peekCalled = xsdc_boolean_false;\n");
+                        foundAll = true;
+                    }
+
+                    writer.write("\n\tif(!peekCalled)\n\t{\n\t");
+                    writer.write("\tallName=axiscSoapDeSerializerPeekNextElementName(pDZ);\n");
+                    writer.write("\t\tpeekCalled = xsdc_boolean_true;\n");
+                    writer.write("\t}\n");
+                    writer.write("\tif(strcmp(allName,\""
+                            + attribs[i].getParamNameAsMember() + "\")==0)\n\t{\n\t");
+                    writer.write("\tpeekCalled = xsdc_boolean_false;\n\t");
+                }
             
             if (attribs[i].isAnyType())
             {

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java?rev=409521&r1=409520&r2=409521&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java Thu May 25 17:39:36 2006
@@ -133,7 +133,7 @@
         try
         {
             //writer.write("#include <stdlib.h>\n");
-            //writer.write("#include <stdio.h>\n");
+            writer.write("#include <stdio.h>\n");
             writer.write("#include <string.h>\n");
             writer.write("\n");
             
@@ -143,7 +143,9 @@
             writer.write("#include <axis/client/Call.h>\n");
             writer.write("#include <axis/IWrapperSoapSerializer.h>\n");
             writer.write("#include <axis/IWrapperSoapDeSerializer.h>\n");
-
+            writer.write("#include <axis/AxisException.h>\n");            
+            writer.write("#include <axis/ISoapFault.h>\n");
+            
             writer.write("\n");
         }
         catch (IOException e)

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java?rev=409521&r1=409520&r2=409521&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java Thu May 25 17:39:36 2006
@@ -61,7 +61,7 @@
             writer.write("extern AXISCHANDLE get_" + classname + "_stub(const char* pchEndPointUri);\n");
             writer.write("extern void destroy_" + classname + "_stub(AXISCHANDLE pStub);\n");
             writer.write("extern int get_" + classname + "_Status(AXISCHANDLE pStub);\n");
-
+            writer.write("extern void set_" + classname + "_ExceptionHandler(AXISCHANDLE pStub, AXIS_EXCEPTION_HANDLER_FUNCT fp);\n");
             writer.write("\n");
             writer.write("/* ********************************************************************* */\n");
             writer.write("/* --- Functions relating to web service methods                     --- */\n");

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java?rev=409521&r1=409520&r2=409521&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java Thu May 25 17:39:36 2006
@@ -25,6 +25,8 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
 
 import javax.xml.namespace.QName;
 
@@ -32,6 +34,7 @@
 import org.apache.axis.wsdl.wsdl2ws.WrapperConstants;
 import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
 import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
+import org.apache.axis.wsdl.wsdl2ws.info.FaultInfo;
 import org.apache.axis.wsdl.wsdl2ws.info.MethodInfo;
 import org.apache.axis.wsdl.wsdl2ws.info.ParameterInfo;
 import org.apache.axis.wsdl.wsdl2ws.info.Type;
@@ -80,11 +83,19 @@
           writer.write("int get_" + classname + "_Status(AXISCHANDLE stub)\n{\n");
           writer.write("\tAXISCHANDLE call = axiscStubGetCall(stub);\n");
           writer.write("\treturn axiscCallGetStatus(call);\n");
-          writer.write("}\n");
+          writer.write("}\n\n");
 
+          writer.write("static AXIS_EXCEPTION_HANDLER_FUNCT " + classname + "_StubExceptionHandler = NULL;\n\n");
+          writer.write("void set_" + classname 
+                  + "_ExceptionHandler(AXISCHANDLE stub, AXIS_EXCEPTION_HANDLER_FUNCT fp)\n{\n");          
+          writer.write("\t" + classname + "_StubExceptionHandler = fp;\n");          
+          writer.write("}\n");
+          
           writer.write("\n");
           writer.write("/* ================================================== */\n" +
                        "/* Functions corresponding to the web service methods */\n" +
+                       "/* (also includes exception handlers for each         */\n" +
+                       "/* web service method)                                */\n" +
                        "/* ================================================== */\n");
           writer.write("\n");
           
@@ -92,6 +103,7 @@
           for (int i = 0; i < methods.size(); i++)
           {
                 minfo = (MethodInfo) methods.get(i);
+                this.writeMethodExceptionHandler(minfo);
                 this.writeMethodInWrapper(minfo);
                 writer.write("\n");
           }
@@ -112,7 +124,7 @@
    */
 
     public void writeMethodInWrapper(MethodInfo minfo) throws WrapperFault, IOException
-    {
+    {             
         boolean isAllTreatedAsOutParams = false;
         ParameterInfo returntype = null;
         int noOfOutParams = minfo.getOutputParameterTypes().size();
@@ -156,7 +168,9 @@
         writer.write(" * This function wraps the service method " + methodName + "\n");
         writer.write(" */\n");
         
-        //method signature
+        // ===================================================================
+        // generate function parameters
+        // ===================================================================
         String paraTypeName;
         boolean typeisarray = false;
         boolean typeissimple = false;
@@ -321,6 +335,10 @@
         
         writer.write(")\n{\n");
         
+        // ===================================================================
+        // start of function body
+        // ===================================================================
+        
         writer.write("\tAXISCHANDLE call = axiscStubGetCall(stub);\n");
         
         if (returntype != null)
@@ -371,6 +389,10 @@
         writer.write ("\tconst char* pcCmplxFaultName = NULL;\n");
         writer.write("\n");
         
+        writer.write ("\taxiscCallSetCExceptionHandlerFunction(call, (void *)" + methodName 
+            + "_ExceptionHandler);\n");
+        writer.write("\n");        
+        
         writer.write("\tif (AXISC_SUCCESS != axiscCallInitialize(call, C_DOC_PROVIDER " + ")) return ");
         if (returntype != null)
             writer.write((returntypeisarray ? "RetArray" : returntypeissimple ? "Ret" : "pReturn") + ";\n");
@@ -898,10 +920,165 @@
             writer.write ("\taxiscCallUnInitialize(call);\n");
             writer.write ("\treturn pReturn;\n");
         }
+        
+        // ===================================================================
+        // end of function body
+        // ===================================================================
 
-        //write end of method
         writer.write("}\n");
     }
+
+private void writeMethodExceptionHandler(MethodInfo minfo) throws WrapperFault, IOException
+{
+    String methodName = minfo.getMethodname();
+    String stubExceptionHandler = classname + "_StubExceptionHandler";
+
+    writer.write("\n/*\n");
+    writer.write(" * This function is the exception handler for the service method " + methodName + "\n");
+    writer.write(" */\n");
+    
+    writer.write ("static void " + methodName 
+            + "_ExceptionHandler(AXISCHANDLE call, int exceptionCode, const char *exceptionString)\n");
+    writer.write ("{\n");
+    
+    // ===================================================================
+    // start of function body
+    // ===================================================================
+    
+    writer.write ("\tconst char* pcCmplxFaultName = NULL;\n");  
+    writer.write ("\tAXISCHANDLE pSoapFault = NULL;\n");    
+    
+    writer.write ("\n");   
+    writer.write ("\tif (AXISC_NODE_VALUE_MISMATCH_EXCEPTION == exceptionCode)\n");   
+    writer.write ("\t\tpSoapFault = axiscCallCheckFault(call, \"Fault\",\""
+              + wscontext.getWrapInfo ().getTargetEndpointURI () + "\" );\n\n");
+    
+    writer.write ("\tif(pSoapFault)\n");
+    writer.write ("\t{\n");
+
+    //to get fault info             
+    Iterator paramsFault = minfo.getFaultType ().iterator ();
+    String faultInfoName = null;
+    String faultType = null;
+    String langName = null;
+    String paramName = null;
+    boolean flag = false;
+    int j = 0;
+    
+    if (paramsFault.hasNext ())
+    {
+        flag = true;
+        writer.write ("\t\tpcCmplxFaultName = axiscSoapFaultGetCmplxFaultObjectName(pSoapFault);\n");
+    }
+    
+    while (paramsFault.hasNext ())
+    {
+        j = j + 1;
+        FaultInfo info = (FaultInfo) paramsFault.next ();
+        faultInfoName = info.getFaultInfo ();
+
+        // FJP - D0004 > Looking through the list of attributes for the 'error' part of
+        //               the fault message.  If found, update the faultInfoName with the
+        //               'localname' of the qname of the attribute.                         
+        Iterator infoArrayListIterator = info.getParams ().iterator ();
+        boolean found = false;
+
+        while (infoArrayListIterator.hasNext () && !found)
+        {
+            ParameterInfo paramInfo = (ParameterInfo) infoArrayListIterator.next ();
+    
+            if (paramInfo != null)
+                if ("error".equals (paramInfo.getParamName ()))
+                {
+                    faultInfoName = paramInfo.getElementName ().getLocalPart ();
+                    found = true;
+                }
+        }
+        // FJP - D0004 <                            
+
+        ArrayList paramInfo = info.getParams ();
+        for (int i = 0; i < paramInfo.size (); i++)
+        {
+            ParameterInfo par = (ParameterInfo) paramInfo.get (i);
+            paramName = par.getParamName ();
+            langName = par.getLangName ();
+            faultType = WrapperUtils.getClassNameFromParamInfoConsideringArrays (par,wscontext);
+            if (j > 1)
+                writer.write ("\t\telse if");
+            else
+                writer.write ("\t\tif");
+
+            writer.write ("(0 == strcmp(\"" + faultInfoName + "\", pcCmplxFaultName))\n");
+            writer.write ("\t\t{\n");
+            writer.write ("\t\t\t" + faultType + " pFaultDetail = \n");
+            writer.write ("\t\t\t\t(" + faultType + ")axiscSoapFaultGetCmplxFaultObject(pSoapFault,\n");
+            writer.write ("\t\t\t\t\t(void*) Axis_DeSerialize_" + langName + ",\n");
+            writer.write ("\t\t\t\t\t(void*) Axis_Create_" + langName + ",\n");
+            writer.write ("\t\t\t\t\t(void*) Axis_Delete_" + langName + ",\n");
+            writer.write ("\t\t\t\t\t\"" + faultInfoName + "\",\n");
+            writer.write ("\t\t\t\t\t0);\n\n");
+
+            writer.write ("\t\t\tif (" + stubExceptionHandler + ")\n");
+            writer.write ("\t\t\t\t" + stubExceptionHandler + "(exceptionCode, exceptionString, pSoapFault, pFaultDetail);\n");
+            writer.write ("\t\t\telse\n");
+            writer.write ("\t\t\t\taxiscAxisInvokeExceptionHandler(exceptionCode, exceptionString, pSoapFault, pFaultDetail);\n\n");        
+            
+            writer.write ("\t\t\tAxis_Delete_" + langName + "(pFaultDetail, 0);\n");
+            
+            writer.write ("\t\t}\n");
+        }
+    }
+    
+    if (flag == true)
+    {
+        writer.write ("\t\telse\n");
+        writer.write ("\t\t{\n");
+    }
+
+    writer.write ("\t\t\tconst char *detail = axiscSoapFaultGetSimpleFaultDetail(pSoapFault);\n");
+    writer.write ("\t\t\tint deleteDetail=0;\n\n");
+    writer.write ("\t\t\tif (NULL==detail || 0==strlen(detail))\n");
+    writer.write ("\t\t\t{\n");
+    writer.write ("\t\t\t\tdetail=axiscCallGetFaultAsXMLString(call);\n\n");
+    writer.write ("\t\t\t\tif (NULL==detail)\n");
+    writer.write ("\t\t\t\t\tdetail=\"\";\n");
+    writer.write ("\t\t\t\telse\n");
+    writer.write ("\t\t\t\t\tdeleteDetail=1;\n");
+    writer.write ("\t\t\t}\n\n");
+
+    writer.write ("\t\t\tif (" + stubExceptionHandler + ")\n");
+    writer.write ("\t\t\t\t" + stubExceptionHandler + "(exceptionCode, exceptionString, pSoapFault, (void *)detail);\n");
+    writer.write ("\t\t\telse\n");
+    writer.write ("\t\t\t\taxiscAxisInvokeExceptionHandler(exceptionCode, exceptionString, pSoapFault, (void *)detail);\n\n");               
+    
+    writer.write ("\t\t\tif (deleteDetail && NULL!=detail)\n");
+    writer.write ("\t\t\t\taxiscAxisDelete( (void *)detail, XSDC_STRING);\n");
+
+    if (flag == true)
+        writer.write ("\t\t}\n");
+    
+    writer.write ("\t}\n");
+    writer.write ("\telse\n");
+    writer.write ("\t{\n");
+
+    writer.write ("\t\tif (" + stubExceptionHandler + ")\n");
+    writer.write ("\t\t\t" + stubExceptionHandler + "(exceptionCode, exceptionString, NULL, NULL);\n");
+    writer.write ("\t\telse\n");
+    writer.write ("\t\t\taxiscAxisInvokeExceptionHandler(exceptionCode, exceptionString, NULL, NULL);\n\n");               
+
+    writer.write ("\t}\n");
+
+    writer.write ("\n");
+    writer.write ("\tif (pSoapFault != NULL);\n");    
+    writer.write ("\t\taxiscSoapFaultDestroy(pSoapFault);\n");  
+    
+    // ===================================================================
+    // end of function body
+    // ===================================================================
+    
+    
+    writer.write ("}\n");
+}
 
     /* (non-Javadoc)
      * @see org.apache.axis.wsdl.wsdl2ws.c.CFileWriter#writeGlobalCodes()

Modified: webservices/axis/trunk/c/tests/auto_build/testcases/client/c/CommonClientTestCode.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/tests/auto_build/testcases/client/c/CommonClientTestCode.h?rev=409521&r1=409520&r2=409521&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/auto_build/testcases/client/c/CommonClientTestCode.h (original)
+++ webservices/axis/trunk/c/tests/auto_build/testcases/client/c/CommonClientTestCode.h Thu May 25 17:39:36 2006
@@ -146,7 +146,7 @@
 #endif
 
 static C_BOOL exceptionOccurred = C_FALSE;
-void exceptionHandler(int errorCode, const char *errorString)
+void exceptionHandler(int errorCode, const char *errorString, void *pSoapFault, void *pSoapFaultDetail)
 {
     exceptionOccurred = C_TRUE;    
     printf("AxisException : %s\n", errorString);

Modified: webservices/axis/trunk/c/tests/auto_build/testcases/client/c/IAttributeTest2Client.c
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/tests/auto_build/testcases/client/c/IAttributeTest2Client.c?rev=409521&r1=409520&r2=409521&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/auto_build/testcases/client/c/IAttributeTest2Client.c (original)
+++ webservices/axis/trunk/c/tests/auto_build/testcases/client/c/IAttributeTest2Client.c Thu May 25 17:39:36 2006
@@ -26,7 +26,7 @@
 #include "CommonClientTestCode.h"
 #include "Calculator.h"
 
-void myExceptionHandler(int errorCode, const char *errorString)
+void myExceptionHandler(int errorCode, const char *errorString, void *soapFault, void *faultDetail)
 {
     exceptionOccurred = C_TRUE;    
     printf("Exception : %s\n", errorString);

Modified: webservices/axis/trunk/c/tests/auto_build/testcases/client/c/TestTransportTimeoutClient.c
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/tests/auto_build/testcases/client/c/TestTransportTimeoutClient.c?rev=409521&r1=409520&r2=409521&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/auto_build/testcases/client/c/TestTransportTimeoutClient.c (original)
+++ webservices/axis/trunk/c/tests/auto_build/testcases/client/c/TestTransportTimeoutClient.c Thu May 25 17:39:36 2006
@@ -20,7 +20,7 @@
 
 #include "Timeout.h"
 
-void myExceptionHandler(int errorCode, const char *errorString)
+void myExceptionHandler(int errorCode, const char *errorString, void *soapFault, void *faultDetail)
 {
     exceptionOccurred = C_TRUE;    
     printf("in AxisException block\n");



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org