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/04/19 02:02:24 UTC

svn commit: r395089 - in /webservices/axis/trunk/c: src/cbindings/ src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ tests/auto_build/testcases/client/c/

Author: nadiramra
Date: Tue Apr 18 17:02:21 2006
New Revision: 395089

URL: http://svn.apache.org/viewcvs?rev=395089&view=rev
Log:
C support fixes/enhancements.

Modified:
    webservices/axis/trunk/c/src/cbindings/AxisC.cpp
    webservices/axis/trunk/c/src/cbindings/IWrapperSoapDeSerializerC.cpp
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java
    webservices/axis/trunk/c/tests/auto_build/testcases/client/c/AxisBenchClient.c

Modified: webservices/axis/trunk/c/src/cbindings/AxisC.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/cbindings/AxisC.cpp?rev=395089&r1=395088&r2=395089&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/cbindings/AxisC.cpp (original)
+++ webservices/axis/trunk/c/src/cbindings/AxisC.cpp Tue Apr 18 17:02:21 2006
@@ -149,12 +149,16 @@
                 Axisc_Array *array = (Axisc_Array*)pValue;
                 
                 // Delete array elements via recursion
-                for (int i=0; i<array->m_Size; ++i)
-                    if (array->m_Array[i])
-                        axiscAxisDelete(array->m_Array[i], array->m_Type);
+                if (array->m_Array)
+                {
+                	for (int i=0; i<array->m_Size; ++i)
+                    	if (array->m_Array[i])
+                        	axiscAxisDelete(array->m_Array[i], array->m_Type);
+                    delete [] array->m_Array;
+                }
 
                 // Delete array
-                delete (Axisc_Array*) pValue;
+                delete array;
                 break;
             }
             case XSDC_BASE64BINARY:
@@ -271,17 +275,23 @@
             case XSDC_BASE64BINARY:
             {
                 xsdc__base64Binary *b64bin = new xsdc__base64Binary();
-                b64bin->__size=0;
-                b64bin->__ptr=NULL;
+                b64bin->__size=size;
+                if (size > 0)
+             		b64bin->__ptr = new xsdc__unsignedByte[size+1];
+                else 
+                	b64bin->__ptr=NULL;
                 retVal = b64bin;
                 break;
             }
             case XSDC_HEXBINARY:
             {
                 xsdc__hexBinary *hexbin = new xsdc__hexBinary();
-                hexbin->__size=0;
-                hexbin->__ptr=NULL;
-                 retVal = hexbin;
+                hexbin->__size=size;
+                if (size > 0)
+             		hexbin->__ptr = new xsdc__unsignedByte[size+1];
+                else
+                	hexbin->__ptr=NULL;
+                retVal = hexbin;
                 break;
             }
             case XSDC_FLOAT:

Modified: webservices/axis/trunk/c/src/cbindings/IWrapperSoapDeSerializerC.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/cbindings/IWrapperSoapDeSerializerC.cpp?rev=395089&r1=395088&r2=395089&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/cbindings/IWrapperSoapDeSerializerC.cpp (original)
+++ webservices/axis/trunk/c/src/cbindings/IWrapperSoapDeSerializerC.cpp Tue Apr 18 17:02:21 2006
@@ -35,34 +35,34 @@
 
 // Following helper function will create a C-binding type of array from a 
 // C++ array
-static Axisc_Array *generateCBindingArray(Axis_Array*objArray, bool deleteObjArray=false)
-{  
-    // Allocate cbinding array and initialize
-    Axisc_Array *c_array = new Axisc_Array();
-    memset(c_array, 0, sizeof(Axisc_Array));
-    
+static Axisc_Array *generateCBindingArray(Axisc_Array *cArray, Axis_Array*objArray, bool deleteObjArray=false)
+{ 
     // If nothing to transform, return
     if (objArray == NULL)
-        return c_array;
+        return cArray;
+             
+    // Allocate cbinding array and initialize
+    if (cArray == NULL)
+        cArray = (Axisc_Array *)axiscAxisNew(XSDC_ARRAY, 0);
     
     // Get object array stuff
     XSDTYPE m_Type;
     int     m_Size;
     void ** m_Array = objArray->get(m_Size, m_Type);
     
-    c_array->m_Size = m_Size;
-    c_array->m_Type = (AXISC_XSDTYPE)m_Type;
+    cArray->m_Size = m_Size;
+    cArray->m_Type = (AXISC_XSDTYPE)m_Type;
     
     // Now generate the array
     if (m_Array != NULL && m_Size > 0)
     {
-        c_array->m_Array = new void*[m_Size];
+        cArray->m_Array = new void*[m_Size];
         
         for (int count = 0 ; count < m_Size ; count++)
         {
             if ( m_Array[count] == NULL)
             {
-                c_array->m_Array[count] = NULL;
+                cArray->m_Array[count] = NULL;
                 continue;
             }
     
@@ -70,279 +70,280 @@
             {
                 case XSD_DURATION:
                 {
-                    ((xsd__duration**) c_array->m_Array)[count] = new xsd__duration();
-                    *((xsd__duration**)c_array->m_Array)[count] = *((xsd__duration**) m_Array)[count];
+                    ((xsd__duration**) cArray->m_Array)[count] = new xsd__duration();
+                    *((xsd__duration**)cArray->m_Array)[count] = *((xsd__duration**) m_Array)[count];
                     break;
                 }
                 case XSD_DATETIME:
                 {
-                    ((xsd__dateTime**) c_array->m_Array)[count] = new xsd__dateTime();
-                    *((xsd__dateTime**)c_array->m_Array)[count] = *((xsd__dateTime**) m_Array)[count];
+                    ((xsd__dateTime**) cArray->m_Array)[count] = new xsd__dateTime();
+                    *((xsd__dateTime**)cArray->m_Array)[count] = *((xsd__dateTime**) m_Array)[count];
                     break;
                 }
                 case XSD_TIME:
                 {
-                    ((xsd__time**) c_array->m_Array)[count] = new xsd__time();
-                    *((xsd__time**)c_array->m_Array)[count] = *((xsd__time**) m_Array)[count];
+                    ((xsd__time**) cArray->m_Array)[count] = new xsd__time();
+                    *((xsd__time**)cArray->m_Array)[count] = *((xsd__time**) m_Array)[count];
                     break;
                 }
                 case XSD_DATE:
                 {
-                    ((xsd__date**) c_array->m_Array)[count] = new xsd__date();
-                    *((xsd__date**)c_array->m_Array)[count] = *((xsd__date**) m_Array)[count];
+                    ((xsd__date**) cArray->m_Array)[count] = new xsd__date();
+                    *((xsd__date**)cArray->m_Array)[count] = *((xsd__date**) m_Array)[count];
                     break;
                 }
                 case XSD_GYEARMONTH:
                 {
-                    ((xsd__gYearMonth**) c_array->m_Array)[count] = new xsd__gYearMonth();
-                    *((xsd__gYearMonth**)c_array->m_Array)[count] = *((xsd__gYearMonth**) m_Array)[count];
+                    ((xsd__gYearMonth**) cArray->m_Array)[count] = new xsd__gYearMonth();
+                    *((xsd__gYearMonth**)cArray->m_Array)[count] = *((xsd__gYearMonth**) m_Array)[count];
                     break;
                 }           
                 case XSD_GYEAR:
                 {
-                    ((xsd__gYear**) c_array->m_Array)[count] = new xsd__gYear();
-                    *((xsd__gYear**)c_array->m_Array)[count] = *((xsd__gYear**) m_Array)[count];
+                    ((xsd__gYear**) cArray->m_Array)[count] = new xsd__gYear();
+                    *((xsd__gYear**)cArray->m_Array)[count] = *((xsd__gYear**) m_Array)[count];
                     break;
                 }
                 case XSD_GMONTHDAY:
                 {
-                    ((xsd__gMonthDay**) c_array->m_Array)[count] = new xsd__gMonthDay();
-                    *((xsd__gMonthDay**)c_array->m_Array)[count] = *((xsd__gMonthDay**) m_Array)[count];
+                    ((xsd__gMonthDay**) cArray->m_Array)[count] = new xsd__gMonthDay();
+                    *((xsd__gMonthDay**)cArray->m_Array)[count] = *((xsd__gMonthDay**) m_Array)[count];
                     break;
                 }
                 case XSD_GDAY:
                 {
-                    ((xsd__gDay**) c_array->m_Array)[count] = new xsd__gDay();
-                    *((xsd__gDay**)c_array->m_Array)[count] = *((xsd__gDay**) m_Array)[count];
+                    ((xsd__gDay**) cArray->m_Array)[count] = new xsd__gDay();
+                    *((xsd__gDay**)cArray->m_Array)[count] = *((xsd__gDay**) m_Array)[count];
                     break;
                 }
                 case XSD_GMONTH:
                 {
-                    ((xsd__gMonth**) c_array->m_Array)[count] = new xsd__gMonth();
-                    *((xsd__gMonth**)c_array->m_Array)[count] = *((xsd__gMonth**) m_Array)[count];
+                    ((xsd__gMonth**) cArray->m_Array)[count] = new xsd__gMonth();
+                    *((xsd__gMonth**)cArray->m_Array)[count] = *((xsd__gMonth**) m_Array)[count];
                     break;
                 }
                 case XSD_STRING:
                 {
-                    ((xsd__string*) c_array->m_Array)[count] = new char[strlen(((xsd__string*) m_Array)[count])+1];
-                    strcpy(((xsd__string*) c_array->m_Array)[count], ((xsd__string*) m_Array)[count]);
+                    ((xsd__string*) cArray->m_Array)[count] = new char[strlen(((xsd__string*) m_Array)[count])+1];
+                    strcpy(((xsd__string*) cArray->m_Array)[count], ((xsd__string*) m_Array)[count]);
                     break;
                 }
                 case XSD_NORMALIZEDSTRING:
                 {
-                    ((xsd__normalizedString*) c_array->m_Array)[count] = new char[strlen(((xsd__normalizedString*) m_Array)[count])+1];
-                    strcpy(((xsd__normalizedString*) c_array->m_Array)[count], ((xsd__normalizedString*) m_Array)[count]);
+                    ((xsd__normalizedString*) cArray->m_Array)[count] = new char[strlen(((xsd__normalizedString*) m_Array)[count])+1];
+                    strcpy(((xsd__normalizedString*) cArray->m_Array)[count], ((xsd__normalizedString*) m_Array)[count]);
                     break;
                 }
                 case XSD_TOKEN:
                 {
-                    ((xsd__token*) c_array->m_Array)[count] = new char[strlen(((xsd__token*) m_Array)[count])+1];
-                    strcpy(((xsd__token*) c_array->m_Array)[count], ((xsd__token*) m_Array)[count]);
+                    ((xsd__token*) cArray->m_Array)[count] = new char[strlen(((xsd__token*) m_Array)[count])+1];
+                    strcpy(((xsd__token*) cArray->m_Array)[count], ((xsd__token*) m_Array)[count]);
                     break;
                 }
                 case XSD_LANGUAGE:
                 {
-                    ((xsd__language*) c_array->m_Array)[count] = new char[strlen(((xsd__language*) m_Array)[count])+1];
-                    strcpy(((xsd__language*) c_array->m_Array)[count], ((xsd__language*) m_Array)[count]);
+                    ((xsd__language*) cArray->m_Array)[count] = new char[strlen(((xsd__language*) m_Array)[count])+1];
+                    strcpy(((xsd__language*) cArray->m_Array)[count], ((xsd__language*) m_Array)[count]);
                     break;
                 }
                 case XSD_NAME:
                 {
-                    ((xsd__Name*) c_array->m_Array)[count] = new char[strlen(((xsd__Name*) m_Array)[count])+1];
-                    strcpy(((xsd__Name*) c_array->m_Array)[count], ((xsd__Name*) m_Array)[count]);
+                    ((xsd__Name*) cArray->m_Array)[count] = new char[strlen(((xsd__Name*) m_Array)[count])+1];
+                    strcpy(((xsd__Name*) cArray->m_Array)[count], ((xsd__Name*) m_Array)[count]);
                     break;
                 }
                 case XSD_NCNAME:
                 {
-                    ((xsd__NCName*) c_array->m_Array)[count] = new char[strlen(((xsd__NCName*) m_Array)[count])+1];
-                    strcpy(((xsd__NCName*) c_array->m_Array)[count], ((xsd__NCName*) m_Array)[count]);
+                    ((xsd__NCName*) cArray->m_Array)[count] = new char[strlen(((xsd__NCName*) m_Array)[count])+1];
+                    strcpy(((xsd__NCName*) cArray->m_Array)[count], ((xsd__NCName*) m_Array)[count]);
                     break;
                 }
                 case XSD_ID:
                 {
-                    ((xsd__ID*) c_array->m_Array)[count] = new char[strlen(((xsd__ID*) m_Array)[count])+1];
-                    strcpy(((xsd__ID*) c_array->m_Array)[count], ((xsd__ID*) m_Array)[count]);
+                    ((xsd__ID*) cArray->m_Array)[count] = new char[strlen(((xsd__ID*) m_Array)[count])+1];
+                    strcpy(((xsd__ID*) cArray->m_Array)[count], ((xsd__ID*) m_Array)[count]);
                     break;
                 }
                 case XSD_IDREF:
                 {
-                    ((xsd__IDREF*) c_array->m_Array)[count] = new char[strlen(((xsd__IDREF*) m_Array)[count])+1];
-                    strcpy(((xsd__IDREF*) c_array->m_Array)[count], ((xsd__IDREF*) m_Array)[count]);
+                    ((xsd__IDREF*) cArray->m_Array)[count] = new char[strlen(((xsd__IDREF*) m_Array)[count])+1];
+                    strcpy(((xsd__IDREF*) cArray->m_Array)[count], ((xsd__IDREF*) m_Array)[count]);
                     break;
                 }
                 case XSD_IDREFS:
                 {
-                    ((xsd__IDREFS*) c_array->m_Array)[count] = new char[strlen(((xsd__IDREFS*) m_Array)[count])+1];
-                    strcpy(((xsd__IDREFS*) c_array->m_Array)[count], ((xsd__IDREFS*) m_Array)[count]);
+                    ((xsd__IDREFS*) cArray->m_Array)[count] = new char[strlen(((xsd__IDREFS*) m_Array)[count])+1];
+                    strcpy(((xsd__IDREFS*) cArray->m_Array)[count], ((xsd__IDREFS*) m_Array)[count]);
                     break;
                 }
                 case XSD_ENTITY:
                 {
-                    ((xsd__ENTITY*) c_array->m_Array)[count] = new char[strlen(((xsd__ENTITY*) m_Array)[count])+1];
-                    strcpy(((xsd__ENTITY*) c_array->m_Array)[count], ((xsd__ENTITY*) m_Array)[count]);
+                    ((xsd__ENTITY*) cArray->m_Array)[count] = new char[strlen(((xsd__ENTITY*) m_Array)[count])+1];
+                    strcpy(((xsd__ENTITY*) cArray->m_Array)[count], ((xsd__ENTITY*) m_Array)[count]);
                     break;
                 }
                 case XSD_ENTITIES:
                 {
-                    ((xsd__ENTITIES*) c_array->m_Array)[count] = new char[strlen(((xsd__ENTITIES*) m_Array)[count])+1];
-                    strcpy(((xsd__ENTITIES*) c_array->m_Array)[count], ((xsd__ENTITIES*) m_Array)[count]);
+                    ((xsd__ENTITIES*) cArray->m_Array)[count] = new char[strlen(((xsd__ENTITIES*) m_Array)[count])+1];
+                    strcpy(((xsd__ENTITIES*) cArray->m_Array)[count], ((xsd__ENTITIES*) m_Array)[count]);
                     break;
                 }
                 case XSD_NMTOKEN:
                 {
-                    ((xsd__NMTOKEN*) c_array->m_Array)[count] = new char[strlen(((xsd__NMTOKEN*) m_Array)[count])+1];
-                    strcpy(((xsd__NMTOKEN*) c_array->m_Array)[count], ((xsd__NMTOKEN*) m_Array)[count]);
+                    ((xsd__NMTOKEN*) cArray->m_Array)[count] = new char[strlen(((xsd__NMTOKEN*) m_Array)[count])+1];
+                    strcpy(((xsd__NMTOKEN*) cArray->m_Array)[count], ((xsd__NMTOKEN*) m_Array)[count]);
                     break;
                 }
                 case XSD_NMTOKENS:
                 {
-                    ((xsd__NMTOKENS*) c_array->m_Array)[count] = new char[strlen(((xsd__NMTOKENS*) m_Array)[count])+1];
-                    strcpy(((xsd__NMTOKENS*) c_array->m_Array)[count], ((xsd__NMTOKENS*) m_Array)[count]);
+                    ((xsd__NMTOKENS*) cArray->m_Array)[count] = new char[strlen(((xsd__NMTOKENS*) m_Array)[count])+1];
+                    strcpy(((xsd__NMTOKENS*) cArray->m_Array)[count], ((xsd__NMTOKENS*) m_Array)[count]);
                     break;
                 }
                 case XSD_BOOLEAN:
                 {
-                    ((xsd__boolean**) c_array->m_Array)[count] = new xsd__boolean();
-                    *((xsd__boolean**)c_array->m_Array)[count] = *((xsd__boolean**) m_Array)[count];
+                    ((xsd__boolean**) cArray->m_Array)[count] = new xsd__boolean();
+                    *((xsd__boolean**)cArray->m_Array)[count] = *((xsd__boolean**) m_Array)[count];
                     break;
                 }
                 case XSD_BASE64BINARY:
                 {
                     // TODO
-                    ((xsd__base64Binary**) c_array->m_Array)[count] = new xsd__base64Binary();
-                    *((xsd__base64Binary**)c_array->m_Array)[count] = *((xsd__base64Binary**) m_Array)[count];
+                    ((xsdc__base64Binary**) cArray->m_Array)[count] = new xsdc__base64Binary();
+                    *((xsdc__base64Binary**)cArray->m_Array)[count] = *((xsdc__base64Binary**) m_Array)[count];
                     break;
                 }
                 case XSD_HEXBINARY:
                 {
                     // TODO
-                    ((xsd__hexBinary**) c_array->m_Array)[count] = new xsd__hexBinary();
-                    *((xsd__hexBinary**)c_array->m_Array)[count] = *((xsd__hexBinary**) m_Array)[count];
+                    ((xsdc__hexBinary**) cArray->m_Array)[count] = new xsdc__hexBinary();
+                    *((xsdc__hexBinary**)cArray->m_Array)[count] = *((xsdc__hexBinary**) m_Array)[count];
                     break;
                 }
                 case XSD_FLOAT:
                 {
-                    ((xsd__float**) c_array->m_Array)[count] = new xsd__float();
-                    *((xsd__float**)c_array->m_Array)[count] = *((xsd__float**) m_Array)[count];
+                    ((xsd__float**) cArray->m_Array)[count] = new xsd__float();
+                    *((xsd__float**)cArray->m_Array)[count] = *((xsd__float**) m_Array)[count];
                     break;
                 }
                 case XSD_DECIMAL:
                 {
-                    ((xsd__decimal**) c_array->m_Array)[count] = new xsd__decimal();
-                    *((xsd__decimal**)c_array->m_Array)[count] = *((xsd__decimal**) m_Array)[count];
+                    ((xsd__decimal**) cArray->m_Array)[count] = new xsd__decimal();
+                    *((xsd__decimal**)cArray->m_Array)[count] = *((xsd__decimal**) m_Array)[count];
                     break;
                 }
                 case XSD_INTEGER:
                 {
-                    ((xsd__integer**) c_array->m_Array)[count] = new xsd__integer();
-                    *((xsd__integer**)c_array->m_Array)[count] = *((xsd__integer**) m_Array)[count];
+                    ((xsd__integer**) cArray->m_Array)[count] = new xsd__integer();
+                    *((xsd__integer**)cArray->m_Array)[count] = *((xsd__integer**) m_Array)[count];
                     break;
                 }
                 case XSD_NONPOSITIVEINTEGER:
                 {
-                    ((xsd__nonPositiveInteger**) c_array->m_Array)[count] = new xsd__nonPositiveInteger();
-                    *((xsd__nonPositiveInteger**)c_array->m_Array)[count] = *((xsd__nonPositiveInteger**) m_Array)[count];
+                    ((xsd__nonPositiveInteger**) cArray->m_Array)[count] = new xsd__nonPositiveInteger();
+                    *((xsd__nonPositiveInteger**)cArray->m_Array)[count] = *((xsd__nonPositiveInteger**) m_Array)[count];
                     break;
                 }
                 case XSD_NEGATIVEINTEGER:
                 {
-                    ((xsd__negativeInteger**) c_array->m_Array)[count] = new xsd__negativeInteger();
-                    *((xsd__negativeInteger**)c_array->m_Array)[count] = *((xsd__negativeInteger**) m_Array)[count];
+                    ((xsd__negativeInteger**) cArray->m_Array)[count] = new xsd__negativeInteger();
+                    *((xsd__negativeInteger**)cArray->m_Array)[count] = *((xsd__negativeInteger**) m_Array)[count];
                     break;
                 }
                 case XSD_LONG:
                 {
-                    ((xsd__long**) c_array->m_Array)[count] = new xsd__long();
-                    *((xsd__long**)c_array->m_Array)[count] = *((xsd__long**) m_Array)[count];
+                    ((xsd__long**) cArray->m_Array)[count] = new xsd__long();
+                    *((xsd__long**)cArray->m_Array)[count] = *((xsd__long**) m_Array)[count];
                     break;
                 }
                 case XSD_INT:
                 {
-                    ((xsd__int**) c_array->m_Array)[count] = new xsd__int();
-                    *((xsd__int**)c_array->m_Array)[count] = *((xsd__int**) m_Array)[count];
+                    ((xsd__int**) cArray->m_Array)[count] = new xsd__int();
+                    *((xsd__int**)cArray->m_Array)[count] = *((xsd__int**) m_Array)[count];
                     break;
                 }
                 case XSD_SHORT:
                 {
-                    ((xsd__short**) c_array->m_Array)[count] = new xsd__short();
-                    *((xsd__short**)c_array->m_Array)[count] = *((xsd__short**) m_Array)[count];
+                    ((xsd__short**) cArray->m_Array)[count] = new xsd__short();
+                    *((xsd__short**)cArray->m_Array)[count] = *((xsd__short**) m_Array)[count];
                     break;
                 }
                 case XSD_BYTE:
                 {
-                    ((xsd__byte**) c_array->m_Array)[count] = new xsd__byte();
-                    *((xsd__byte**)c_array->m_Array)[count] = *((xsd__byte**) m_Array)[count];
+                    ((xsd__byte**) cArray->m_Array)[count] = new xsd__byte();
+                    *((xsd__byte**)cArray->m_Array)[count] = *((xsd__byte**) m_Array)[count];
                     break;
                 }
                 case XSD_NONNEGATIVEINTEGER:
                 {
-                    ((xsd__nonNegativeInteger**) c_array->m_Array)[count] = new xsd__nonNegativeInteger();
-                    *((xsd__nonNegativeInteger**)c_array->m_Array)[count] = *((xsd__nonNegativeInteger**) m_Array)[count];
+                    ((xsd__nonNegativeInteger**) cArray->m_Array)[count] = new xsd__nonNegativeInteger();
+                    *((xsd__nonNegativeInteger**)cArray->m_Array)[count] = *((xsd__nonNegativeInteger**) m_Array)[count];
                     break;
                 }
                 case XSD_UNSIGNEDLONG:
                 {
-                    ((xsd__unsignedLong**) c_array->m_Array)[count] = new xsd__unsignedLong();
-                    *((xsd__unsignedLong**)c_array->m_Array)[count] = *((xsd__unsignedLong**) m_Array)[count];
+                    ((xsd__unsignedLong**) cArray->m_Array)[count] = new xsd__unsignedLong();
+                    *((xsd__unsignedLong**)cArray->m_Array)[count] = *((xsd__unsignedLong**) m_Array)[count];
                     break;
                 }
                 case XSD_UNSIGNEDINT:
                 {
-                    ((xsd__unsignedInt**) c_array->m_Array)[count] = new xsd__unsignedInt();
-                    *((xsd__unsignedInt**)c_array->m_Array)[count] = *((xsd__unsignedInt**) m_Array)[count];
+                    ((xsd__unsignedInt**) cArray->m_Array)[count] = new xsd__unsignedInt();
+                    *((xsd__unsignedInt**)cArray->m_Array)[count] = *((xsd__unsignedInt**) m_Array)[count];
                     break;
                 }
                 case XSD_UNSIGNEDSHORT:
                 {
-                    ((xsd__unsignedShort**) c_array->m_Array)[count] = new xsd__unsignedShort();
-                    *((xsd__unsignedShort**)c_array->m_Array)[count] = *((xsd__unsignedShort**) m_Array)[count];
+                    ((xsd__unsignedShort**) cArray->m_Array)[count] = new xsd__unsignedShort();
+                    *((xsd__unsignedShort**)cArray->m_Array)[count] = *((xsd__unsignedShort**) m_Array)[count];
                     break;
                 }
                 case XSD_UNSIGNEDBYTE:
                 {
-                    ((xsd__unsignedByte**) c_array->m_Array)[count] = new xsd__unsignedByte();
-                    *((xsd__unsignedByte**)c_array->m_Array)[count] = *((xsd__unsignedByte**) m_Array)[count];
+                    ((xsd__unsignedByte**) cArray->m_Array)[count] = new xsd__unsignedByte();
+                    *((xsd__unsignedByte**)cArray->m_Array)[count] = *((xsd__unsignedByte**) m_Array)[count];
                     break;
                 }
                 case XSD_POSITIVEINTEGER:
                 {
-                    ((xsd__positiveInteger**) c_array->m_Array)[count] = new xsd__positiveInteger();
-                    *((xsd__positiveInteger**)c_array->m_Array)[count] = *((xsd__positiveInteger**) m_Array)[count];
+                    ((xsd__positiveInteger**) cArray->m_Array)[count] = new xsd__positiveInteger();
+                    *((xsd__positiveInteger**)cArray->m_Array)[count] = *((xsd__positiveInteger**) m_Array)[count];
                     break;
                 }
                 case XSD_DOUBLE:
                 {
-                    ((xsd__double**) c_array->m_Array)[count] = new xsd__double();
-                    *((xsd__double**)c_array->m_Array)[count] = *((xsd__double**) m_Array)[count];
+                    ((xsd__double**) cArray->m_Array)[count] = new xsd__double();
+                    *((xsd__double**)cArray->m_Array)[count] = *((xsd__double**) m_Array)[count];
                     break;
                 }
                 case XSD_ANYURI:
                 {
-                    ((xsd__anyURI*) c_array->m_Array)[count] = new char[strlen(((xsd__anyURI*) m_Array)[count])+1];
-                    strcpy(((xsd__anyURI*) c_array->m_Array)[count], ((xsd__anyURI*) m_Array)[count]);
+                    ((xsd__anyURI*) cArray->m_Array)[count] = new char[strlen(((xsd__anyURI*) m_Array)[count])+1];
+                    strcpy(((xsd__anyURI*) cArray->m_Array)[count], ((xsd__anyURI*) m_Array)[count]);
                     break;
                 }
                 case XSD_QNAME:
                 {
-                    ((xsd__QName*) c_array->m_Array)[count] = new char[strlen(((xsd__QName*) m_Array)[count])+1];
-                    strcpy(((xsd__QName*) c_array->m_Array)[count], ((xsd__QName*) m_Array)[count]);
+                    ((xsd__QName*) cArray->m_Array)[count] = new char[strlen(((xsd__QName*) m_Array)[count])+1];
+                    strcpy(((xsd__QName*) cArray->m_Array)[count], ((xsd__QName*) m_Array)[count]);
                     break;
                 }
                 case XSD_NOTATION:
                 {
-                    ((xsd__NOTATION*) c_array->m_Array)[count] = new char[strlen(((xsd__NOTATION*) m_Array)[count])+1];
-                    strcpy(((xsd__NOTATION*) c_array->m_Array)[count], ((xsd__NOTATION*) m_Array)[count]);
+                    ((xsd__NOTATION*) cArray->m_Array)[count] = new char[strlen(((xsd__NOTATION*) m_Array)[count])+1];
+                    strcpy(((xsd__NOTATION*) cArray->m_Array)[count], ((xsd__NOTATION*) m_Array)[count]);
                     break;
                 }
                 case XSD_ARRAY:
                 {
                     // TODO
-                    ((Axis_Array**) c_array->m_Array)[count] = new Axis_Array(*((Axis_Array**) m_Array)[count]);
+                    cArray->m_Array[count] = m_Array[count];
                     break;
                 }
                 case USER_TYPE:
                 {
-                    c_array->m_Array[count] = m_Array[count];
+                    // TODO
+                    cArray->m_Array[count] = m_Array[count];
                     break;
                 }
                 case XSD_UNKNOWN:
@@ -354,7 +355,11 @@
         } // end for loop
     }
     
-    return c_array;
+    // delete c++ object array if requested to do so before returning
+    if (deleteObjArray)
+        delete objArray;
+    
+    return cArray;
 }
 
 
@@ -441,21 +446,15 @@
 
     try
     {
-        // TODO
         Axis_Array  tmpObjArray;
-        Axis_Array *pTmpObjArray=NULL;
         
-        if (pArray && pArray->m_Array)
-        {
-            tmpObjArray.set((void **)pArray->m_Array, pArray->m_Size, (XSDTYPE)pArray->m_Type);
-            pTmpObjArray = &tmpObjArray;
-        }
+        tmpObjArray.set((void **)pArray->m_Array, pArray->m_Size, (XSDTYPE)pArray->m_Type);
         
-        Axis_Array* pObjArray = dz->getCmplxArray(pTmpObjArray, 
+        Axis_Array* pObjArray = dz->getCmplxArray(&tmpObjArray, 
                                                   pDZFunct, pCreFunct, pDelFunct, pSizeFunct, 
                                                   pName, pNamespace);
         
-        return generateCBindingArray(pObjArray, true);
+        return generateCBindingArray(pArray, pObjArray, false);
     }
     catch ( AxisException& e  )
     {
@@ -480,7 +479,7 @@
     try
     {
         Axis_Array* pObjArray = dz->getBasicArray((XSDTYPE)nType, pName, pNamespace);
-        return generateCBindingArray(pObjArray, true);
+        return generateCBindingArray(NULL, pObjArray, true);
     }
     catch ( AxisException& e  )
     {
@@ -897,10 +896,28 @@
 
     try
     {
-        // TODO: not implemented yet
-        xsdc__hexBinary * hb = new xsdc__hexBinary();
-        memset(hb,0,sizeof(hb));
-        return hb;
+        xsd__hexBinary * pObjCpp = dz->getElementAsHexBinary(pName, pNamespace);
+        
+        if (!pObjCpp)
+            return (xsdc__hexBinary *)NULL;
+        
+        // Get info from c++ Object
+        int hexDataSize;
+        xsd__unsignedByte *hexData = pObjCpp->get(hexDataSize);
+                       
+        // Create c-style equivalent object
+        xsdc__hexBinary * pObjC = (xsdc__hexBinary *)axiscAxisNew(XSDC_HEXBINARY, hexDataSize);
+        
+        // populate c-style object with data from c++ object
+        if (hexDataSize > 0)
+        {
+            memcpy(pObjC->__ptr, hexData, hexDataSize);
+            pObjC->__ptr[hexDataSize] = '\0';
+        }
+        
+        // Delete c++ object before returning c object
+        delete pObjCpp;       
+        return pObjC;
     }
     catch ( AxisException& e  )
     {
@@ -910,6 +927,7 @@
     {
         axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
+    
     return (xsdc__hexBinary *)NULL;
 }
 
@@ -922,10 +940,28 @@
 
     try
     {
-        // TODO: not implemented yet
-        xsdc__base64Binary * bb = new xsdc__base64Binary();
-        memset(bb,0,sizeof(bb));
-        return bb;
+        xsd__base64Binary * pObjCpp = dz->getElementAsBase64Binary(pName, pNamespace);
+        
+        if (!pObjCpp)
+            return (xsdc__base64Binary *)NULL;
+        
+        // Get info from c++ Object
+        int base64BinaryDataSize;
+        xsd__unsignedByte *base64BinaryData = pObjCpp->get(base64BinaryDataSize);
+                       
+        // Create c-style equivalent object
+        xsdc__base64Binary * pObjC = (xsdc__base64Binary *)axiscAxisNew(XSDC_BASE64BINARY, base64BinaryDataSize);
+        
+        // populate c-style object with data from c++ object
+        if (base64BinaryDataSize > 0)
+        {
+            memcpy(pObjC->__ptr, base64BinaryData, base64BinaryDataSize);
+            pObjC->__ptr[base64BinaryDataSize] = '\0';
+        }
+        
+        // Delete c++ object before returning c object
+        delete pObjCpp;       
+        return pObjC;
     }
     catch ( AxisException& e  )
     {
@@ -1408,10 +1444,28 @@
 
     try
     {
-        // TODO not implemented yet
-        xsdc__hexBinary * hb = new xsdc__hexBinary();
-        memset(hb,0,sizeof(hb));
-        return hb;
+        xsd__hexBinary * pObjCpp = dz->getAttributeAsHexBinary(pName, pNamespace);
+        
+        if (!pObjCpp)
+            return (xsdc__hexBinary *)NULL;
+        
+        // Get info from c++ Object
+        int hexDataSize;
+        xsd__unsignedByte *hexData = pObjCpp->get(hexDataSize);
+                       
+        // Create c-style equivalent object
+        xsdc__hexBinary * pObjC = (xsdc__hexBinary *)axiscAxisNew(XSDC_HEXBINARY, hexDataSize);
+        
+        // populate c-style object with data from c++ object
+        if (hexDataSize > 0)
+        {
+            memcpy(pObjC->__ptr, hexData, hexDataSize);
+            pObjC->__ptr[hexDataSize] = '\0';
+        }
+        
+        // Delete c++ object before returning c object
+        delete pObjCpp;       
+        return pObjC;        
     }
     catch ( AxisException& e  )
     {
@@ -1434,10 +1488,28 @@
 
     try
     {
-        // TODO not implemented yet
-        xsdc__base64Binary * bb = new xsdc__base64Binary();
-        memset(bb,0,sizeof(bb));
-        return bb;
+        xsd__base64Binary * pObjCpp = dz->getAttributeAsBase64Binary(pName, pNamespace);
+        
+        if (!pObjCpp)
+            return (xsdc__base64Binary *)NULL;
+        
+        // Get info from c++ Object
+        int base64BinaryDataSize;
+        xsd__unsignedByte *base64BinaryData = pObjCpp->get(base64BinaryDataSize);
+                       
+        // Create c-style equivalent object
+        xsdc__base64Binary * pObjC = (xsdc__base64Binary *)axiscAxisNew(XSDC_BASE64BINARY, base64BinaryDataSize);
+        
+        // populate c-style object with data from c++ object
+        if (base64BinaryDataSize > 0)
+        {
+            memcpy(pObjC->__ptr, base64BinaryData, base64BinaryDataSize);
+            pObjC->__ptr[base64BinaryDataSize] = '\0';
+        }
+        
+        // Delete c++ object before returning c object
+        delete pObjCpp;       
+        return pObjC;
     }
     catch ( AxisException& e  )
     {

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java?rev=395089&r1=395088&r2=395089&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java Tue Apr 18 17:02:21 2006
@@ -152,6 +152,8 @@
                     + "(NULL, 1, nSize);\n");
             writer.write("\t\tpArray->m_Size = nSize;\n"); 
             writer.write("\t}\n");
+            writer.write("\n");
+            writer.write("\treturn pArray;\n");
             
             // End function body
 

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java?rev=395089&r1=395088&r2=395089&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 Tue Apr 18 17:02:21 2006
@@ -713,7 +713,9 @@
         writer.write(" */\n");
         
         writer.write("void* Axis_Create_" + classname + "(void* pObj, AxiscBool bArray, int nSize)\n{\n");
+        
         writer.write("\t" + classname + "* pTemp;\n");
+        writer.write("\n");
         writer.write("\tif (bArray && (nSize > 0))\n\t{\n");
         writer.write("\t\tif (pObj)\n\t\t{\n");
         writer.write("\t\t\tpObj = (void *)  realloc(pObj, sizeof(" + classname + " *)*nSize);\n");
@@ -725,8 +727,27 @@
         writer.write("\t\t\tmemset(pObj, 0, sizeof(" + classname + " *)*nSize);\n\t\t}\n");
         writer.write("\t}\n\telse\n\t{\n");
         writer.write("\t\tpObj = (void *)  malloc(sizeof(" + classname + "));\n");
-        writer.write("\t\tmemset(pObj, 0, sizeof(" + classname + "));\n\n");
-        writer.write("\t}\n\treturn pObj;\n}\n");
+        writer.write("\t\tmemset(pObj, 0, sizeof(" + classname + "));\n");
+        writer.write("\t\tpTemp = (" + classname + " *)pObj;\n");
+        
+        for (int i = 0; i < attribs.length; i++)
+            if (!(attribs[i].isSimpleType() || attribs[i].getType().isSimpleType()))
+            {
+                if (attribs[i].isArray())
+                {
+                    writer.write("\t\tpTemp->" + attribs[i].getParamName() + " = "
+                            + "Axis_Create_" + attribs[i].getTypeName() + "_Array(0);\n");
+                }
+                else
+                {
+                    writer.write("\t\tpTemp->" + attribs[i].getParamName() + " = "
+                            + "Axis_Create_" + attribs[i].getTypeName() + "(0,0,0);\n");                   
+                }
+            }
+        
+        writer.write("\t}\n");
+        writer.write("\n");
+        writer.write("\treturn pObj;\n}\n");
     }
 
     /**
@@ -797,7 +818,6 @@
             }
             else
             {
-
                 String deleteFunctionSuffix = "";
                 if (attribs[i].isArray())
                     deleteFunctionSuffix = "_Array";

Modified: webservices/axis/trunk/c/tests/auto_build/testcases/client/c/AxisBenchClient.c
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/auto_build/testcases/client/c/AxisBenchClient.c?rev=395089&r1=395088&r2=395089&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/auto_build/testcases/client/c/AxisBenchClient.c (original)
+++ webservices/axis/trunk/c/tests/auto_build/testcases/client/c/AxisBenchClient.c Tue Apr 18 17:02:21 2006
@@ -115,21 +115,13 @@
     for(i = 0; i < request; i++)
     {
         if (output)
-        { 
-        	int j;
-            BenchBasicDataType **	outArray = output->infos->m_Array;             
-			for( j = 0; j < output->infos->m_Size; j++)
-			{
-				Axis_Delete_BenchBasicDataType(outArray[j], 0, 0);
-				
-				/* Who deletes output->infos?? */
-			}
-
+        {      
             Axis_Delete_BenchDataType(output,0,0);
             output = NULL;
         }
 
         output = doBenchRequest(ws, input);
+        
         if (exceptionOccurred == C_TRUE 
               || output == NULL 
               || get_AxisBench_Status(ws) == AXISC_FAIL )
@@ -138,6 +130,12 @@
 
     for( i = 0; i < input->count; i++)
     {
+        /* since these are pointers to our own buffers, null them out before deleting  */
+        ppBBDT[i]->StringType = NULL;
+        ppBBDT[i]->QNameType  = NULL;
+        ppBBDT[i]->Base64BinaryType.__ptr=NULL;
+        ppBBDT[i]->HexBinary.__ptr=NULL;
+        
         Axis_Delete_BenchBasicDataType(ppBBDT[i],0,0);
     }
 
@@ -145,6 +143,7 @@
       free(ppBBDT);
     if (buffer)
 	  free( buffer);
+    input->infos = NULL;
 
   	if (exceptionOccurred == C_TRUE 
   			|| output == NULL 
@@ -165,11 +164,11 @@
       	{
       		if( outArray[i] != NULL)
       		{
-                printf( " ----------------------------------------------" );
+                printf( " ----------------------------------------------\n" );
                 printf( " StringType %s\n", outArray[i]->StringType );
                 printf( " IntType %d\n", outArray[i]->IntType );
-                printf( " IntegerType %d\n", outArray[i]->IntegerType );
-                printf( " DoubleType %f\n", outArray[i]->DoubleType );
+                printf( " IntegerType %lld\n", outArray[i]->IntegerType );
+                printf( " DoubleType %g\n", outArray[i]->DoubleType );
                 printf( " BooleanType %d\n", outArray[i]->BooleanType );
                 strftime(dateTime, 50, "%a %b %d %H:%M:%S %Y", &outArray[i]->DateTimeType);
                 printf( " DateTimeType %s\n", dateTime );
@@ -181,20 +180,20 @@
                 if( outArray[i]->ByteType == 0x31)
                 	outArray[i]->ByteType = '1';
 #endif
-                printf( " ByteType %d\n", outArray[i]->ByteType );
-                printf( " DecimalType %f\n", outArray[i]->DecimalType );
-                printf( " FloatType %f\n", outArray[i]->FloatType );
-                printf( " LongType %ld\n", outArray[i]->LongType );
+                printf( " ByteType %c\n", outArray[i]->ByteType );
+                printf( " DecimalType %g\n", outArray[i]->DecimalType );
+                printf( " FloatType %g\n", outArray[i]->FloatType );
+                printf( " LongType %lld\n", outArray[i]->LongType );
                 printf( " QNameType %s\n", outArray[i]->QNameType );
-                printf( " ShortType %d\n", outArray[i]->ShortType );
+                printf( " ShortType %hd\n", outArray[i]->ShortType );
 
-                printf( " Base64BinaryType ", outArray[i]->Base64BinaryType.__size );
+                printf( " Base64BinaryType %d\n", outArray[i]->Base64BinaryType.__size );
                 if( outArray[i]->Base64BinaryType.__size > 0)
-                    printf( " Base64BinaryType ", asciiToString((char *)outArray[i]->Base64BinaryType.__ptr) );
+                    printf( " Base64BinaryType %s\n", asciiToString((char *)outArray[i]->Base64BinaryType.__ptr) );
 
-                printf( " HexBinaryType ", outArray[i]->HexBinary.__size );
+                printf( " HexBinaryType %d\n", outArray[i]->HexBinary.__size );
                 if( outArray[i]->HexBinary.__size > 0)
-                    printf( " HexBinaryType ", asciiToString( (char *) outArray[i]->HexBinary.__ptr) );	    
+                    printf( " HexBinaryType %s\n", asciiToString( (char *) outArray[i]->HexBinary.__ptr) );	    
       		}
       		
       		returnValue = 0;
@@ -204,7 +203,7 @@
   	Axis_Delete_BenchDataType (input,0,0);
   	Axis_Delete_BenchDataType (output,0,0);
 
-    printf( "---------------------- TEST COMPLETE -----------------------------" );
+    printf( "---------------------- TEST COMPLETE -----------------------------\n" );
     
 	return returnValue;
 }