Return-Path: Delivered-To: apmail-ws-axis-cvs-archive@www.apache.org Received: (qmail 7239 invoked from network); 3 May 2006 05:49:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 May 2006 05:49:22 -0000 Received: (qmail 85244 invoked by uid 500); 3 May 2006 05:49:21 -0000 Delivered-To: apmail-ws-axis-cvs-archive@ws.apache.org Received: (qmail 84987 invoked by uid 500); 3 May 2006 05:49:20 -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 84976 invoked by uid 99); 3 May 2006 05:49:20 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 May 2006 22:49:20 -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: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 02 May 2006 22:49:19 -0700 Received: (qmail 7028 invoked by uid 65534); 3 May 2006 05:48:59 -0000 Message-ID: <20060503054859.7027.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r399154 - in /webservices/axis/trunk/c/src/cbindings: IWrapperSoapDeSerializerC.cpp IWrapperSoapSerializerC.cpp client/CallC.cpp Date: Wed, 03 May 2006 05:48:58 -0000 To: axis-cvs@ws.apache.org From: nadiramra@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: nadiramra Date: Tue May 2 22:48:57 2006 New Revision: 399154 URL: http://svn.apache.org/viewcvs?rev=399154&view=rev Log: C support fixes/enhancements. Modified: webservices/axis/trunk/c/src/cbindings/IWrapperSoapDeSerializerC.cpp webservices/axis/trunk/c/src/cbindings/IWrapperSoapSerializerC.cpp webservices/axis/trunk/c/src/cbindings/client/CallC.cpp Modified: webservices/axis/trunk/c/src/cbindings/IWrapperSoapDeSerializerC.cpp URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/cbindings/IWrapperSoapDeSerializerC.cpp?rev=399154&r1=399153&r2=399154&view=diff ============================================================================== --- webservices/axis/trunk/c/src/cbindings/IWrapperSoapDeSerializerC.cpp (original) +++ webservices/axis/trunk/c/src/cbindings/IWrapperSoapDeSerializerC.cpp Tue May 2 22:48:57 2006 @@ -112,7 +112,8 @@ { Axis_Array tmpObjArray; - tmpObjArray.set((void **)pArray->m_Array, pArray->m_Size, (XSDTYPE)pArray->m_Type); + if (pArray && pArray->m_Array) + tmpObjArray.set((void **)pArray->m_Array, pArray->m_Size, (XSDTYPE)pArray->m_Type); Axis_Array* pObjArray = dz->getCmplxArray(&tmpObjArray, pDZFunct, pCreFunct, pDelFunct, pName, pNamespace); Modified: webservices/axis/trunk/c/src/cbindings/IWrapperSoapSerializerC.cpp URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/cbindings/IWrapperSoapSerializerC.cpp?rev=399154&r1=399153&r2=399154&view=diff ============================================================================== --- webservices/axis/trunk/c/src/cbindings/IWrapperSoapSerializerC.cpp (original) +++ webservices/axis/trunk/c/src/cbindings/IWrapperSoapSerializerC.cpp Tue May 2 22:48:57 2006 @@ -207,7 +207,12 @@ try { - return sz->addOutputCmplxArrayParam((const Axis_Array*)pArray,pSZFunct,pDelFunct,pName,pNamespace); + // Need to convert C-style array to C++-style array before calling serialization method. + Axis_Array objArray; + if (pArray && pArray->m_Array) + objArray.set((void **)pArray->m_Array, pArray->m_Size, (XSDTYPE)pArray->m_Type); + + return sz->addOutputCmplxArrayParam((const Axis_Array*)&objArray,pSZFunct,pDelFunct,pName,pNamespace); } catch ( AxisException& e ) { @@ -231,7 +236,12 @@ try { - return sz->addOutputBasicArrayParam((const Axis_Array*)pArray,(XSDTYPE)nType,pName); + // Need to convert C-style array to C++-style array before calling serialization method. + Axis_Array objArray; + if (pArray && pArray->m_Array) + objArray.set((void **)pArray->m_Array, pArray->m_Size, (XSDTYPE)pArray->m_Type); + + return sz->addOutputBasicArrayParam((const Axis_Array*)&objArray,(XSDTYPE)nType,pName); } catch ( AxisException& e ) { Modified: webservices/axis/trunk/c/src/cbindings/client/CallC.cpp URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/cbindings/client/CallC.cpp?rev=399154&r1=399153&r2=399154&view=diff ============================================================================== --- webservices/axis/trunk/c/src/cbindings/client/CallC.cpp (original) +++ webservices/axis/trunk/c/src/cbindings/client/CallC.cpp Tue May 2 22:48:57 2006 @@ -363,7 +363,12 @@ try { - c->addCmplxArrayParameter((Axis_Array*)pArray,pSZFunct,pDelFunct,pName,pNamespace); + // Need to convert C-style array to C++-style array before calling serialization method. + Axis_Array objArray; + if (pArray && pArray->m_Array) + objArray.set((void **)pArray->m_Array, pArray->m_Size, (XSDTYPE)pArray->m_Type); + + c->addCmplxArrayParameter(&objArray,pSZFunct,pDelFunct,pName,pNamespace); } catch ( AxisException& e ) { @@ -390,7 +395,12 @@ try { - c->addBasicArrayParameter((Axis_Array*)pArray, (XSDTYPE)nType, pName); + // Need to convert C-style array to C++-style array before calling serialization method. + Axis_Array objArray; + if (pArray && pArray->m_Array) + objArray.set((void **)pArray->m_Array, pArray->m_Size, (XSDTYPE)pArray->m_Type); + + c->addBasicArrayParameter(&objArray, (XSDTYPE)nType, pName); } catch ( AxisException& e ) {