ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r382660 - in /webservices/axis2/trunk/c/modules: core/clientapi/ core/deployment/ core/description/ wsdl/
Date Fri, 03 Mar 2006 05:03:38 GMT
Author: damitha
Date: Thu Mar  2 21:03:37 2006
New Revision: 382660

URL: http://svn.apache.org/viewcvs?rev=382660&view=rev
Log:
When  createing a operation description from operation name and filling phases
from TemplateOperation there was problem of double freeing because both
new op and TemplateOperation tries to free them. Fixed it by not creating
a new operation but by using the Template Operation itself, setting the new name to 
TemplateOperation.

Modified:
    webservices/axis2/trunk/c/modules/core/clientapi/call.c
    webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
    webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
    webservices/axis2/trunk/c/modules/core/description/op.c
    webservices/axis2/trunk/c/modules/core/description/svc.c
    webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c

Modified: webservices/axis2/trunk/c/modules/core/clientapi/call.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/call.c?rev=382660&r1=382659&r2=382660&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/call.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/call.c Thu Mar  2 21:03:37 2006
@@ -861,14 +861,15 @@
         {
             op = AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, op_qname);            
         }
-        
-        /* now free qname as it is no more required */
-        AXIS2_QNAME_FREE(op_qname, env);
-        
+         
         if (!op)
         {
-            op = axis2_call_create_op_fill_flow(call, env, op_name);
+            /*op = axis2_call_create_op_fill_flow(call, env, op_name);*/
+            op = AXIS2_SVC_GET_OP_WITH_NAME(svc, env, "TemplateOperation");
+            AXIS2_OP_SET_QNAME(op, env, op_qname);
         }
+        /* now free qname as it is no more required */
+        AXIS2_QNAME_FREE(op_qname, env);
         
         if (!op || !svc)
             return NULL;
@@ -941,14 +942,15 @@
         {
             op = AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, op_qname);            
         }
-        
-        /* now free qname as it is no more required */
-        AXIS2_QNAME_FREE(op_qname, env);
-        
+         
         if (!op)
         {
-            op = axis2_call_create_op_fill_flow(call, env, op_name);
+            /*op = axis2_call_create_op_fill_flow(call, env, op_name);*/
+            op = AXIS2_SVC_GET_OP_WITH_NAME(svc, env, "TemplateOperation");
+            AXIS2_OP_SET_QNAME(op, env, op_qname);
         }
+        /* now free qname as it is no more required */
+        AXIS2_QNAME_FREE(op_qname, env);
         
         if (!op)
             return NULL;
@@ -1016,13 +1018,14 @@
             op = AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, op_qname);            
         }
         
-        /* now free qname as it is no more required */
-        AXIS2_QNAME_FREE(op_qname, env);
-        
         if (!op)
         {
-            op = axis2_call_create_op_fill_flow(call, env, op_name);
-        }
+            /*op = axis2_call_create_op_fill_flow(call, env, op_name);*/
+            op = AXIS2_SVC_GET_OP_WITH_NAME(svc, env, "TemplateOperation");
+            AXIS2_OP_SET_QNAME(op, env, op_qname);
+        }  
+        /* now free qname as it is no more required */
+        AXIS2_QNAME_FREE(op_qname, env);
         
         if (!op)
             return AXIS2_FAILURE;
@@ -1071,13 +1074,14 @@
             op = AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, op_qname);            
         }
         
-        /* now free qname as it is no more required */
-        AXIS2_QNAME_FREE(op_qname, env);
-        
         if (!op)
         {
-            op = axis2_call_create_op_fill_flow(call, env, op_name);
-        }
+            /*op = axis2_call_create_op_fill_flow(call, env, op_name);*/
+            op = AXIS2_SVC_GET_OP_WITH_NAME(svc, env, "TemplateOperation");
+            AXIS2_OP_SET_QNAME(op, env, op_qname);
+        } 
+        /* now free qname as it is no more required */
+        AXIS2_QNAME_FREE(op_qname, env);
         
         if (!op)
             return AXIS2_FAILURE;

Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c?rev=382660&r1=382659&r2=382660&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c Thu Mar  2 21:03:37
2006
@@ -261,6 +261,11 @@
         AXIS2_FREE((*env)->allocator, file_data_impl->module_name);
         file_data_impl->module_name = NULL;        
     }
+    if(file_data_impl->module_dll_name)
+    {
+        AXIS2_FREE((*env)->allocator, file_data_impl->module_dll_name);
+        file_data_impl->module_dll_name = NULL;        
+    }
     if(file_data_impl->name)
     {
         AXIS2_FREE((*env)->allocator, file_data_impl->name);
@@ -457,7 +462,7 @@
     file_data_impl = AXIS2_INTF_TO_IMPL(file_data);
     
     svc_qname = AXIS2_SVC_GET_QNAME(svc_desc, env);
-    svc_name = AXIS2_QNAME_GET_LOCALPART(svc_qname, env);
+    svc_name = AXIS2_QNAME_TO_STRING(svc_qname, env);
     if(!file_data_impl->svc_map)
     {
         file_data_impl->svc_map = axis2_hash_make(env);

Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?rev=382660&r1=382659&r2=382660&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Thu Mar  2 21:03:37 2006
@@ -343,15 +343,15 @@
     while(AXIS2_TRUE == AXIS2_OM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(handlers ,env))
     {
         axis2_om_node_t *handler_node = NULL;
-        axis2_handler_desc_t *handler = NULL;
+        axis2_handler_desc_t *handler_desc = NULL;
         axis2_status_t status = AXIS2_FAILURE;
             
         handler_node = (axis2_om_node_t *)
             AXIS2_OM_CHILDREN_QNAME_ITERATOR_NEXT(handlers, env);
         
-        handler = axis2_desc_builder_process_handler(desc_builder, env, 
+        handler_desc = axis2_desc_builder_process_handler(desc_builder, env, 
             handler_node, parent);
-        status = AXIS2_FLOW_ADD_HANDLER(flow, env, handler);
+        status = AXIS2_FLOW_ADD_HANDLER(flow, env, handler_desc);
         if(AXIS2_SUCCESS != status)
         {
             AXIS2_FLOW_FREE(flow, env);
@@ -395,9 +395,11 @@
     name_attrib = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(handler_element, env, 
         attr_qname);
     if(attr_qname)
+    {
         AXIS2_QNAME_FREE(attr_qname, env);
+    }
 
-    if(NULL == name_attrib)
+    if(!name_attrib)
     {
         AXIS2_HANDLER_DESC_FREE(handler_desc, env);
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
@@ -498,7 +500,7 @@
 
                 phase_rule = AXIS2_HANDLER_DESC_GET_RULES(handler_desc, env);
                 status = AXIS2_PHASE_RULE_SET_AFTER(phase_rule, env, value);
-                if(AXIS2_FAILURE == status)
+                if(AXIS2_SUCCESS != status)
                 {
                     AXIS2_HANDLER_DESC_FREE(handler_desc, env);
                     return NULL;
@@ -509,7 +511,7 @@
                 struct axis2_phase_rule *phase_rule = NULL;
                 phase_rule = AXIS2_HANDLER_DESC_GET_RULES(handler_desc, env);
                 status = AXIS2_PHASE_RULE_SET_BEFORE(phase_rule, env, value);
-                if(AXIS2_FAILURE == status)
+                if(AXIS2_SUCCESS != status)
                 {
                     AXIS2_HANDLER_DESC_FREE(handler_desc, env);
                     return NULL;
@@ -520,7 +522,7 @@
                 struct axis2_phase_rule *phase_rule = NULL;
                 phase_rule = AXIS2_HANDLER_DESC_GET_RULES(handler_desc, env);
                 status = AXIS2_PHASE_RULE_SET_NAME(phase_rule, env, value);
-                if(AXIS2_FAILURE == status)
+                if(AXIS2_SUCCESS != status)
                 {
                     AXIS2_HANDLER_DESC_FREE(handler_desc, env);
                     return NULL;
@@ -651,7 +653,7 @@
         /* Setting paramter Value (the chiled elemnt of the paramter) */
         para_value = AXIS2_OM_ELEMENT_GET_FIRST_ELEMENT(param_element, env,
             param_node, &para_node);
-        if(NULL != para_value)
+        if(para_value)
         {
             /* TODO uncomment this when find usages */
             /*
@@ -673,10 +675,10 @@
                 param_element, env, param_node);
             para_test_value = AXIS2_STRDUP(temp, env);
             status = AXIS2_PARAM_SET_VALUE(param, env, para_test_value);
-            if(AXIS2_FAILURE == status)
+            if(AXIS2_SUCCESS != status)
             {
                 AXIS2_PARAM_FREE(param, env);
-                return AXIS2_FAILURE;
+                return status;
             }
             AXIS2_PARAM_SET_PARAM_TYPE(param, env, AXIS2_TEXT_PARAM);
         }
@@ -685,7 +687,7 @@
         para_locked = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(param_element, env, 
             att_locked);
         AXIS2_QNAME_FREE(att_locked, env);
-        if(NULL != parent)
+        if(parent)
         {
             axis2_char_t *param_name = NULL;
 
@@ -693,7 +695,7 @@
             parent_para = AXIS2_PARAM_CONTAINER_GET_PARAM(parent, env, 
                 param_name);
         }
-        if(NULL != para_locked)
+        if(para_locked)
         {
             axis2_char_t *locked_value = NULL;
             locked_value = AXIS2_OM_ATTRIBUTE_GET_VALUE(para_locked, env);
@@ -707,7 +709,7 @@
                 param_name = AXIS2_PARAM_GET_NAME(param, env);
                 is_param_locked = AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(parent,
                     env, param_name);
-                if(NULL != parent && AXIS2_TRUE == is_param_locked)
+                if(parent && AXIS2_TRUE == is_param_locked)
                 {
                     AXIS2_PARAM_FREE(param, env);
                     AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_CONF_NOT_FOUND,
@@ -725,22 +727,33 @@
             }
         }
         
-        if(NULL != parent)
+        if(parent)
         {
             axis2_char_t *name = NULL;
             axis2_bool_t bvalue = AXIS2_FALSE;
+
             name = AXIS2_PARAM_GET_NAME(param, env);
             bvalue = AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(parent, env, name);
-            if(NULL != parent_para || AXIS2_FALSE == bvalue)
+            if(parent_para || AXIS2_FALSE == bvalue)
             {
                 status = AXIS2_PARAM_CONTAINER_ADD_PARAM(param_container, env, 
                     param);
+                if(AXIS2_SUCCESS != status)
+                {
+                    AXIS2_PARAM_FREE(param, env);
+                    return status;
+                }
             }
         }
         else
         {
             status = AXIS2_PARAM_CONTAINER_ADD_PARAM(param_container, env, 
-                param);            
+                param);           
+            if(AXIS2_SUCCESS != status)
+            {
+                AXIS2_PARAM_FREE(param, env);
+                return status;
+            } 
         }   
     }
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/module_builder.c?rev=382660&r1=382659&r2=382660&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Thu Mar  2 21:03:37
2006
@@ -296,12 +296,15 @@
 
     if(NULL != in_flow_element && NULL != in_flow_node)
     {
-        axis2_flow_t *flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(module_builder->
+        axis2_flow_t *flow = NULL;
+        
+        flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(module_builder->
             desc_builder, env, in_flow_element, builder_impl->module_desc->params,
                 in_flow_node);
         status = AXIS2_MODULE_DESC_SET_INFLOW(builder_impl->module_desc, env, flow);
         if(AXIS2_SUCCESS != status)
         {
+            AXIS2_FLOW_FREE(flow, env);
             return status;
         }
     }
@@ -314,12 +317,15 @@
 
     if(NULL != out_flow_element && NULL != out_flow_node)
     {
-        axis2_flow_t *flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(module_builder->
+        axis2_flow_t *flow = NULL;
+        
+        flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(module_builder->
             desc_builder, env, out_flow_element, builder_impl->module_desc->params,
                 out_flow_node);
         status = AXIS2_MODULE_DESC_SET_OUTFLOW(builder_impl->module_desc, env, flow);
         if(AXIS2_SUCCESS != status)
         {
+            AXIS2_FLOW_FREE(flow, env);
             return status;
         }
     }
@@ -332,12 +338,15 @@
 
     if(NULL != in_fault_flow_element && NULL != in_fault_flow_node)
     {
-        axis2_flow_t *flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(module_builder->
+        axis2_flow_t *flow = NULL;
+        
+        flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(module_builder->
             desc_builder, env, in_fault_flow_element, builder_impl->module_desc->
                 params, in_fault_flow_node);
         status = AXIS2_MODULE_DESC_SET_FAULT_INFLOW(builder_impl->module_desc, env, flow);
         if(AXIS2_SUCCESS != status)
         {
+            AXIS2_FLOW_FREE(flow, env);
             return status;
         }
     }
@@ -350,13 +359,16 @@
 
     if(NULL != out_fault_flow_element && NULL != out_fault_flow_node)
     {
-        axis2_flow_t *flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(module_builder->
+        axis2_flow_t *flow = NULL;
+
+        flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(module_builder->
             desc_builder, env, out_fault_flow_element, builder_impl->module_desc->
                 params, out_fault_flow_node);
         status = AXIS2_MODULE_DESC_SET_FAULT_OUTFLOW(builder_impl->module_desc, 
             env, flow);
         if(AXIS2_SUCCESS != status)
         {
+            AXIS2_FLOW_FREE(flow, env);
             return status;
         }
     }

Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?rev=382660&r1=382659&r2=382660&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Thu Mar  2 21:03:37 2006
@@ -280,7 +280,7 @@
         itr, param_container_l, parent->param_container);
     if(AXIS2_SUCCESS != status)
     {
-        return AXIS2_FAILURE;
+        return status;
     }
 
     /* process service description */
@@ -364,7 +364,7 @@
     if(AXIS2_SUCCESS != status)
     {
         AXIS2_DLL_DESC_FREE(dll_desc, env);
-        return AXIS2_FAILURE;
+        return status;
     }
     /* free all temp vars */
     AXIS2_FREE((*env)->allocator, temp_path);
@@ -377,7 +377,7 @@
     impl_info_param->ops->value_free = axis2_dll_desc_free_void_arg;
     if(AXIS2_SUCCESS != status)
     {
-        return AXIS2_FAILURE;
+        return status;
     }
     /* end of my logic */
     /* processing service wide modules which required to engage globally */
@@ -389,7 +389,7 @@
     status = axis2_svc_builder_process_module_refs(svc_builder, env, module_refs);
     if(AXIS2_SUCCESS != status)
     {
-        return AXIS2_FAILURE;
+        return status;
     }
 
     /* process INFLOW */
@@ -401,12 +401,14 @@
     if(in_flow_element != NULL && NULL != in_flow_node)
     {
         axis2_flow_t *flow = NULL;
+
         flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(svc_builder->desc_builder, env,
             in_flow_element, builder_impl->svc->param_container, in_flow_node);
         status = AXIS2_SVC_SET_INFLOW(builder_impl->svc, env, flow);
-        if(AXIS2_FAILURE == status)
+        if(AXIS2_SUCCESS != status)
         {
-            return AXIS2_FAILURE;
+            AXIS2_FLOW_FREE(flow, env);
+            return status;
         }
     }
 
@@ -418,12 +420,14 @@
     if(NULL != out_flow_element && NULL != out_flow_node)
     {
         axis2_flow_t *flow = NULL;
+
         flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(svc_builder->desc_builder, env,
             out_flow_element, builder_impl->svc->param_container, out_flow_node);
         status = AXIS2_SVC_SET_OUTFLOW(builder_impl->svc, env, flow);
-        if(AXIS2_FAILURE == status)
+        if(AXIS2_SUCCESS != status)
         {
-            return AXIS2_FAILURE;
+            AXIS2_FLOW_FREE(flow, env);
+            return status;
         }
     }
 
@@ -436,13 +440,15 @@
     if(in_faultflow_element != NULL && NULL != in_faultflow_node)
     {
         axis2_flow_t *flow = NULL;
+
         flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(svc_builder->desc_builder, env,
             in_faultflow_element, builder_impl->svc->param_container, 
                 in_faultflow_node);
         status = AXIS2_SVC_SET_FAULT_INFLOW(builder_impl->svc, env, flow);
-        if(AXIS2_FAILURE == status)
+        if(AXIS2_SUCCESS != status)
         {
-            return AXIS2_FAILURE;
+            AXIS2_FLOW_FREE(flow, env);
+            return status;
         }
     }
 
@@ -454,13 +460,15 @@
     if(NULL != out_faultflow_element && NULL != out_faultflow_node)
     {
         axis2_flow_t *flow = NULL;
+
         flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(svc_builder->desc_builder, env,
             out_faultflow_element, builder_impl->svc->param_container, 
                 out_faultflow_node);
         status = AXIS2_SVC_SET_FAULT_OUTFLOW(builder_impl->svc, env, flow);
-        if(AXIS2_FAILURE == status)
+        if(AXIS2_SUCCESS != status)
         {
-            return AXIS2_FAILURE;
+            AXIS2_FLOW_FREE(flow, env);
+            return status;
         }
         
     }
@@ -513,7 +521,7 @@
     status = axis2_svc_builder_process_svc_module_conf(svc_builder, env, 
         module_configs_itr, builder_impl->svc->param_container, builder_impl->svc);
     */
-    return status;
+    return AXIS2_SUCCESS;
 }
 
 static axis2_array_list_t *
@@ -599,7 +607,7 @@
         {
             axis2_char_t *mep = NULL;
             
-            /* craeting operation from existing operation */
+            /* Creating operation from existing operation */
             mep = AXIS2_WSDL_OP_GET_MSG_EXCHANGE_PATTERN(wsdl_op, env);
             if(NULL == mep)
             {

Modified: webservices/axis2/trunk/c/modules/core/description/op.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/op.c?rev=382660&r1=382659&r2=382660&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Thu Mar  2 21:03:37 2006
@@ -375,8 +375,7 @@
         return NULL;        
 	}
 
-	op_impl->wsdl_op = (axis2_wsdl_op_t *)
-		axis2_wsdl_op_create(env);		
+	op_impl->wsdl_op = (axis2_wsdl_op_t *) axis2_wsdl_op_create(env);		
 	if(NULL == op_impl->wsdl_op)
 	{
         axis2_op_free(&(op_impl->op), env);
@@ -384,7 +383,8 @@
         return NULL;		
 	}
     /* Set the function pointers of the base */
-    op_impl->op.base.ops = AXIS2_MALLOC((*env)->allocator, sizeof(axis2_wsdl_op_ops_t));
+    op_impl->op.base.ops = AXIS2_MALLOC((*env)->allocator, 
+        sizeof(axis2_wsdl_op_ops_t));
     op_impl->op.base.ops->free_void_arg = axis2_op_free_void_arg;
     op_impl->op.base.ops->get_qname = axis2_op_get_qname;
 
@@ -633,8 +633,7 @@
     op_qname = AXIS2_OP_GET_QNAME(op, env);
     op_name = AXIS2_QNAME_GET_LOCALPART(op_qname, env);
     
-    if(op_impl->remaining_phases_inflow && 
-        (0 != AXIS2_STRCMP(op_name, "TemplateOperation")))
+    if(op_impl->remaining_phases_inflow)
     {
         int i = 0;
         int size = 0;
@@ -656,8 +655,7 @@
         op_impl->remaining_phases_inflow = NULL;
     }
     
-    if(NULL != op_impl->phases_outflow &&
-        (0 != AXIS2_STRCMP(op_name, "TemplateOperation")))
+    if(NULL != op_impl->phases_outflow)
     {
         int i = 0;
         int size = 0;
@@ -677,8 +675,7 @@
         op_impl->phases_outflow = NULL;
     }
     
-    if(NULL != op_impl->phases_in_fault_flow &&
-        (0 != AXIS2_STRCMP(op_name, "TemplateOperation")))
+    if(NULL != op_impl->phases_in_fault_flow)
     {
         int i = 0;
         int size = 0;
@@ -698,8 +695,7 @@
         op_impl->phases_in_fault_flow = NULL;
     }
     
-    if(NULL != op_impl->phases_out_fault_flow &&
-        (0 != AXIS2_STRCMP(op_name, "TemplateOperation")))
+    if(NULL != op_impl->phases_out_fault_flow)
     {
         int i = 0;
         int size = 0;
@@ -950,10 +946,9 @@
                             axis2_qname_t *qname)
 {
     axis2_op_impl_t *op_impl = NULL;
-    axis2_char_t *op_n = NULL;
+    
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 	op_impl = AXIS2_INTF_TO_IMPL(op);
-    op_n = AXIS2_QNAME_GET_LOCALPART(qname, env); 
     
     return AXIS2_WSDL_OP_SET_QNAME(op_impl->wsdl_op, env, qname);
 }

Modified: webservices/axis2/trunk/c/modules/core/description/svc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/svc.c?rev=382660&r1=382659&r2=382660&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Thu Mar  2 21:03:37 2006
@@ -327,7 +327,7 @@
 	}
     
     /** Create modle list of default size */
-    svc_impl->module_list = axis2_array_list_create(env, 20);
+    svc_impl->module_list = axis2_array_list_create(env, 0);
     if(NULL == svc_impl->module_list)
     {
         axis2_svc_free(&(svc_impl->svc), env);

Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c?rev=382660&r1=382659&r2=382660&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c Thu Mar  2 21:03:37 2006
@@ -263,36 +263,29 @@
 {
     axis2_wsdl_interface_impl_t *wsdl_interface_impl = NULL;
     
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE); 
     wsdl_interface_impl = AXIS2_INTF_TO_IMPL(wsdl_interface);
     
-	if(NULL != wsdl_interface->ops)
+	if(wsdl_interface->ops)
     {
         AXIS2_FREE((*env)->allocator, wsdl_interface->ops);
         wsdl_interface->ops = NULL;
     }
     
-    if(NULL != wsdl_interface_impl->super_interfaces)
+    if(wsdl_interface_impl->super_interfaces)
     {
         axis2_hash_free(wsdl_interface_impl->super_interfaces, env);
         wsdl_interface_impl->super_interfaces = NULL;
     }
     
-    if(NULL != wsdl_interface_impl->ops)
+    if(wsdl_interface_impl->ops)
     {
         axis2_hash_index_t *hi = NULL;
         void *val = NULL;
         for (hi = axis2_hash_first (wsdl_interface_impl->ops, env); hi;
                  hi = axis2_hash_next ( env, hi))
         {
-            axis2_qname_t *op_qn = NULL;
-            axis2_wsdl_op_t *op_o = NULL;
-            axis2_char_t *op_n = NULL;
             axis2_hash_this (hi, NULL, NULL, &val);
-            op_o = (axis2_wsdl_op_t *) val;
-            op_qn = AXIS2_WSDL_OP_GET_QNAME(op_o, env);
-            op_n = AXIS2_QNAME_GET_LOCALPART(op_qn, env);
             AXIS2_WSDL_OP_FREE_VOID_ARG(val, env);
             val = NULL;
                
@@ -301,25 +294,25 @@
         wsdl_interface_impl->ops = NULL;
     }
     
-    if(NULL != wsdl_interface_impl->faults)
+    if(wsdl_interface_impl->faults)
     {
         AXIS2_LINKED_LIST_FREE(wsdl_interface_impl->faults, env);
         wsdl_interface_impl->faults = NULL;
     }
     
-    if(NULL != AXIS2_INTF_TO_IMPL(wsdl_interface)->qname)
+    if(wsdl_interface_impl->qname)
     {
         AXIS2_QNAME_FREE(wsdl_interface_impl->qname, env);
         wsdl_interface_impl->qname = NULL;
     }
     
-    if(NULL != wsdl_interface_impl->style_default)
+    if(wsdl_interface_impl->style_default)
     {
         AXIS2_FREE((*env)->allocator, wsdl_interface_impl->style_default);
         wsdl_interface_impl->style_default = NULL;
     }
     
-    if(NULL != wsdl_interface->extensible_component)
+    if(wsdl_interface->extensible_component)
     {
         AXIS2_WSDL_EXTENSIBLE_COMPONENT_FREE(wsdl_interface->
             extensible_component, env);



Mime
View raw message