Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 70088 invoked from network); 22 Mar 2005 13:22:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 22 Mar 2005 13:22:44 -0000 Received: (qmail 19812 invoked by uid 500); 22 Mar 2005 13:22:42 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 19770 invoked by uid 500); 22 Mar 2005 13:22:42 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 19755 invoked by uid 99); 22 Mar 2005 13:22:42 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 22 Mar 2005 05:22:41 -0800 Received: (qmail 70070 invoked by uid 1922); 22 Mar 2005 13:22:40 -0000 Date: 22 Mar 2005 13:22:40 -0000 Message-ID: <20050322132240.70069.qmail@minotaur.apache.org> From: prestonf@apache.org To: ws-axis-cvs@apache.org Subject: cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal ClientStubWriter.java X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N prestonf 2005/03/22 05:22:40 Modified: c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal ClientStubWriter.java Log: Hi All, I think this will complete what needs to be done for AXISCPP-477. Regards, Fred Preston. Revision Changes Path 1.84 +35 -34 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java Index: ClientStubWriter.java =================================================================== RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- ClientStubWriter.java 17 Mar 2005 17:14:44 -0000 1.83 +++ ClientStubWriter.java 22 Mar 2005 13:22:40 -0000 1.84 @@ -1097,17 +1097,18 @@ writer.write ("\t}\n"); writer.write ("\tcatch(AxisException& e)\n\t{\n"); - writer.write ("\t\tint iExceptionCode = e.getExceptionCode();\n"); + writer.write ("\t\tint iExceptionCode = e.getExceptionCode();\n\n"); writer. write ("\t\tif(AXISC_NODE_VALUE_MISMATCH_EXCEPTION != iExceptionCode)\n"); writer.write ("\t\t{\n"); + writer.write ("\t\t\tm_pCall->unInitialize();\n"); // AXISCPP-477 writer.write ("\t\t\tthrow;\n"); - writer.write ("\t\t}\n"); + writer.write ("\t\t}\n\n"); writer.write ("\t\tISoapFault* pSoapFault = (ISoapFault*)\n"); writer.write ("\t\t\tm_pCall->checkFault(\"Fault\",\"" + wscontext.getWrapInfo ().getTargetEndpointURI () - + "\" );\n"); + + "\" );\n\n"); writer.write ("\t\tif(pSoapFault)\n"); writer.write ("\t\t{\n"); @@ -1121,37 +1122,34 @@ int j = 0; if (!paramsFault.hasNext ()) { - writer. - write - ("\t\t\t\tconst char *detail = pSoapFault->getSimpleFaultDetail();\n"); - writer.write ("\t\t\t\tbool deleteDetail=false;\n"); + writer.write ("\t\t\t\tconst char *detail = pSoapFault->getSimpleFaultDetail();\n"); + writer.write ("\t\t\t\tbool deleteDetail=false;\n\n"); writer.write ("\t\t\t\tif (NULL==detail || 0==strlen(detail))\n"); writer.write ("\t\t\t\t{\n"); - writer. - write ("\t\t\t\t\tdetail=m_pCall->getFaultAsXMLString();\n"); + writer.write ("\t\t\t\t\tdetail=m_pCall->getFaultAsXMLString();\n"); writer.write ("\t\t\t\t\tif (NULL==detail)\n"); + writer.write ("\t\t\t\t\t{\n"); writer.write ("\t\t\t\t\t\tdetail=\"\";\n"); + writer.write ("\t\t\t\t\t}\n"); writer.write ("\t\t\t\t\telse\n"); + writer.write ("\t\t\t\t\t{\n"); writer.write ("\t\t\t\t\t\tdeleteDetail=true;\n"); - writer.write ("\t\t\t\t}\n"); - writer. - write - ("\t\t\t\tOtherFaultException ofe(pSoapFault->getFaultcode(),\n"); - writer. - write - ("\t\t\t\t\tpSoapFault->getFaultstring(), pSoapFault->getFaultactor(),\n"); - writer.write ("\t\t\t\t\tdetail, iExceptionCode);\n"); + writer.write ("\t\t\t\t\t}\n"); + writer.write ("\t\t\t\t}\n\n"); + writer.write ("\t\t\t\tOtherFaultException ofe(pSoapFault->getFaultcode(),\n"); + writer.write ("\t\t\t\t\tpSoapFault->getFaultstring(), pSoapFault->getFaultactor(),\n"); + writer.write ("\t\t\t\t\tdetail, iExceptionCode);\n\n"); writer.write ("\t\t\t\tif (deleteDetail && NULL!=detail)\n"); + writer.write ("\t\t\t\t{\n"); writer.write ("\t\t\t\t\tdelete [] const_cast(detail);\n"); + writer.write ("\t\t\t\t}\n\n"); writer.write ("\t\t\t\tm_pCall->unInitialize();\n"); writer.write ("\t\t\t\tthrow ofe;\n"); } else { flag = true; - writer. - write - ("\t\t\tpcCmplxFaultName = pSoapFault->getCmplxFaultObjectName();\n"); + writer.write ("\t\t\tpcCmplxFaultName = pSoapFault->getCmplxFaultObjectName();\n"); } while (paramsFault.hasNext ()) { @@ -1189,8 +1187,7 @@ ParameterInfo par = (ParameterInfo) paramInfo.get (i); paramName = par.getParamName (); langName = par.getLangName (); - faultType = - WrapperUtils. + faultType = WrapperUtils. getClassNameFromParamInfoConsideringArrays (par, wscontext); if (j > 1) @@ -1214,31 +1211,35 @@ writer. write ("\t\t\t\tconst char *detail = pSoapFault->getSimpleFaultDetail();\n"); - writer.write ("\t\t\t\tbool deleteDetail=false;\n"); + writer.write ("\t\t\t\tbool deleteDetail=false;\n\n"); writer.write ("\t\t\t\tif (NULL==detail || 0==strlen(detail))\n"); writer.write ("\t\t\t\t{\n"); - writer. - write ("\t\t\t\t\tdetail=m_pCall->getFaultAsXMLString();\n"); + writer.write ("\t\t\t\t\tdetail=m_pCall->getFaultAsXMLString();\n\n"); writer.write ("\t\t\t\t\tif (NULL==detail)\n"); + writer.write ("\t\t\t\t\t{\n"); writer.write ("\t\t\t\t\t\tdetail=\"\";\n"); + writer.write ("\t\t\t\t\t}\n"); writer.write ("\t\t\t\t\telse\n"); + writer.write ("\t\t\t\t\t{\n"); writer.write ("\t\t\t\t\t\tdeleteDetail=true;\n"); - writer.write ("\t\t\t\t}\n"); - writer. - write - ("\t\t\t\tOtherFaultException ofe(pSoapFault->getFaultcode(),\n"); - writer. - write - ("\t\t\t\t\tpSoapFault->getFaultstring(), pSoapFault->getFaultactor(),\n"); - writer.write ("\t\t\t\t\tdetail, iExceptionCode);\n"); + writer.write ("\t\t\t\t\t}\n"); + writer.write ("\t\t\t\t}\n\n"); + writer.write ("\t\t\t\tOtherFaultException ofe(pSoapFault->getFaultcode(),\n"); + writer.write ("\t\t\t\t\tpSoapFault->getFaultstring(), pSoapFault->getFaultactor(),\n"); + writer.write ("\t\t\t\t\tdetail, iExceptionCode);\n\n"); writer.write ("\t\t\t\tif (deleteDetail && NULL!=detail)\n"); + writer.write ("\t\t\t\t{\n"); writer.write ("\t\t\t\t\tdelete [] const_cast(detail);\n"); + writer.write ("\t\t\t\t}\n\n"); writer.write ("\t\t\t\tm_pCall->unInitialize();\n"); writer.write ("\t\t\t\tthrow ofe;\n"); writer.write ("\t\t\t}\n"); } writer.write ("\t\t}\n"); - writer.write ("\t\telse throw;\n"); + writer.write ("\t\telse\n"); writer.write ("\t\t{\n"); + writer.write ("\t\t\tm_pCall->unInitialize();\n"); // AXISCPP-477 + writer.write ("\t\t\tthrow;\n"); + writer.write ("\t\t}\n"); writer.write ("\t}\n"); writer.write ("}\n"); }