Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 95068 invoked from network); 29 May 2006 23:55:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 29 May 2006 23:55:13 -0000 Received: (qmail 44054 invoked by uid 500); 29 May 2006 23:55:11 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 44021 invoked by uid 500); 29 May 2006 23:55:11 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 44006 invoked by uid 99); 29 May 2006 23:55:11 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 May 2006 16:55:11 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 May 2006 16:55:10 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 0F5661A983A; Mon, 29 May 2006 16:54:50 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r410165 - in /webservices/axis/trunk/c/src/cbindings/client: CallC.cpp StubC.cpp Date: Mon, 29 May 2006 23:54:49 -0000 To: axis-cvs@ws.apache.org From: nadiramra@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060529235450.0F5661A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: nadiramra Date: Mon May 29 16:54:49 2006 New Revision: 410165 URL: http://svn.apache.org/viewvc?rev=410165&view=rev Log: C support fixes/enhancements. Modified: webservices/axis/trunk/c/src/cbindings/client/CallC.cpp webservices/axis/trunk/c/src/cbindings/client/StubC.cpp Modified: webservices/axis/trunk/c/src/cbindings/client/CallC.cpp URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/cbindings/client/CallC.cpp?rev=410165&r1=410164&r2=410165&view=diff ============================================================================== --- webservices/axis/trunk/c/src/cbindings/client/CallC.cpp (original) +++ webservices/axis/trunk/c/src/cbindings/client/CallC.cpp Mon May 29 16:54:49 2006 @@ -80,7 +80,7 @@ } catch ( AxisException& e ) { - processException(c, e); + axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); } catch ( ... ) { 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=410165&r1=410164&r2=410165&view=diff ============================================================================== --- webservices/axis/trunk/c/src/cbindings/client/StubC.cpp (original) +++ webservices/axis/trunk/c/src/cbindings/client/StubC.cpp Mon May 29 16:54:49 2006 @@ -42,6 +42,18 @@ extern "C" { +static void processException(StubC *s, int exceptionCode, const char *whatString) +{ + AXIS_EXCEPTION_HANDLER_FUNCT exceptionHandler = axiscAxisInvokeExceptionHandler; + void *stubExceptionHandler; + + if ((stubExceptionHandler = s->getCExceptionHandler()) != NULL) + exceptionHandler = (AXIS_EXCEPTION_HANDLER_FUNCT)stubExceptionHandler; + + exceptionHandler(exceptionCode, whatString, NULL, NULL); +} + + AXISC_STORAGE_CLASS_INFO AXISCHANDLE axiscStubCreate(const char * pcEndPointURI, AXISC_PROTOCOL_TYPE eProtocol) @@ -91,7 +103,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -100,13 +112,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } } @@ -117,7 +129,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -126,13 +138,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } } @@ -143,7 +155,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -152,13 +164,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } return (const char *)NULL; @@ -170,7 +182,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -179,13 +191,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } return (const char *)NULL; @@ -197,7 +209,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -206,13 +218,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } return (const char *)NULL; @@ -224,7 +236,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -233,13 +245,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } return (const char *)NULL; @@ -251,7 +263,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -260,13 +272,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } return (const char *)NULL; @@ -278,7 +290,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -287,13 +299,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } } @@ -304,7 +316,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -313,13 +325,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } } @@ -331,7 +343,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -340,13 +352,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } } @@ -358,7 +370,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -370,13 +382,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } return (AXISCHANDLE)NULL; @@ -387,7 +399,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -396,13 +408,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } return (AXISCHANDLE)NULL; @@ -413,7 +425,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -422,13 +434,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } return (AXISCHANDLE)NULL; @@ -439,7 +451,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -448,13 +460,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } return (AXISCHANDLE)NULL; @@ -465,7 +477,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -474,13 +486,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } } @@ -489,7 +501,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -498,13 +510,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } } @@ -515,7 +527,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -524,13 +536,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } } @@ -540,7 +552,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -549,13 +561,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } } @@ -564,7 +576,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -573,13 +585,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } return -1; @@ -591,7 +603,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -600,13 +612,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } } @@ -616,7 +628,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -625,13 +637,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } } @@ -640,7 +652,7 @@ { - Stub *s = (Stub*)stub; + StubC *s = (StubC*)stub; try { @@ -649,13 +661,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } return (AXISC_PROTOCOL_TYPE)-1; @@ -677,13 +689,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } return (AXISCHANDLE)NULL; @@ -703,13 +715,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } } AXISC_STORAGE_CLASS_INFO @@ -726,13 +738,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } } @@ -750,13 +762,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } } @@ -781,13 +793,13 @@ catch ( AxisException& e ) { - axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what(), NULL, NULL); + processException(s, e.getExceptionCode(), e.what()); } catch ( ... ) { - axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.", NULL, NULL); + processException(s, -1, "Unrecognized exception thrown."); } } --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org