axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r380650 - in /webservices/axis2/trunk/c/modules: core/deployment/ core/description/ core/engine/ wsdl/
Date Fri, 24 Feb 2006 11:59:49 GMT
Author: damitha
Date: Fri Feb 24 03:59:41 2006
New Revision: 380650

URL: http://svn.apache.org/viewcvs?rev=380650&view=rev
Log:
Now arch_reader is released

Modified:
    webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
    webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
    webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h
    webservices/axis2/trunk/c/modules/core/deployment/axis2_module_builder.h
    webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
    webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
    webservices/axis2/trunk/c/modules/core/description/op.c
    webservices/axis2/trunk/c/modules/core/description/param.c
    webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c
    webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c

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=380650&r1=380649&r2=380650&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 Fri Feb 24 03:59:41
2006
@@ -408,7 +408,7 @@
         AXIS2_FREE((*env)->allocator, file_data_impl->module_name);
         file_data_impl->module_name = NULL;
     }
-    file_data_impl->module_name = module_name;
+    file_data_impl->module_name = AXIS2_STRDUP(module_name, env);
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c?rev=380650&r1=380649&r2=380650&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Fri Feb 24 03:59:41 2006
@@ -508,7 +508,7 @@
         {
             AXIS2_MODULE_BUILDER_FREE(arch_reader_impl->module_builder, env);
             arch_reader_impl->module_builder = NULL;
-        }
+        } 
         arch_reader_impl->module_builder = 
             axis2_module_builder_create_with_file_and_dep_engine_and_module(env,
                 module_xml, dep_engine, module_desc);

Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h?rev=380650&r1=380649&r2=380650&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h Fri Feb 24 03:59:41
2006
@@ -42,7 +42,7 @@
 struct axis2_ws_info;
 struct axis2_phases_info;
 struct axis2_svc;
-    
+
 typedef struct axis2_dep_engine axis2_dep_engine_t;
 typedef struct axis2_dep_engine_ops axis2_dep_engine_ops_t;
 
@@ -191,7 +191,7 @@
     set_arch_reader)(axis2_dep_engine_t *dep_engine,
                         axis2_env_t **env,
                         struct axis2_arch_reader *arch_reader);
-
+    
 };
     
     /** 

Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_module_builder.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/axis2_module_builder.h?rev=380650&r1=380649&r2=380650&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_module_builder.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_module_builder.h Fri Feb 24 03:59:41
2006
@@ -70,7 +70,7 @@
 AXIS2_DECLARE_DATA struct axis2_module_builder
 {
 	axis2_module_builder_ops_t *ops;
-    axis2_desc_builder_t *desc_builder;
+    struct axis2_desc_builder *desc_builder;
 };
 
 /**

Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?rev=380650&r1=380649&r2=380650&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Fri Feb 24 03:59:41 2006
@@ -53,27 +53,22 @@
     /**
      * this will store all the web Services to undeploy
      */
-    axis2_array_list_t *ws_to_undeploy;
-    
+    axis2_array_list_t *ws_to_undeploy;    
     axis2_phases_info_t *phases_info; /* to store phases list in axis2.xml */
     /**
      * this constructor for the testing
      */
     axis2_char_t *folder_name;
-
     /**
      * Full path to the server xml file(axis2.xml)
      */
     axis2_char_t *conf_name;
-
     /**
      * To store the module specified in the server.xml at the document parsing 
      * time
      */
     axis2_array_list_t *module_list;
- 
     axis2_repos_listener_t *repos_listener; /*Added this here to help with feeing memory
allocated for this - Samisa*/
-    
     axis2_conf_builder_t *conf_builder;
     axis2_svc_builder_t *svc_builder;
 } axis2_dep_engine_impl_t;
@@ -1489,10 +1484,15 @@
             switch (type) 
             {
                 case AXIS2_SVC:
+                    if(dep_engine_impl->arch_reader)
+                    {
+                        AXIS2_ARCH_READER_FREE(dep_engine_impl->arch_reader, env);
+                        dep_engine_impl->arch_reader = NULL;
+                    }
                     dep_engine_impl->arch_reader = axis2_arch_reader_create(env);
 		    
                     
-                    /*archiveReader.processWSDLs(currentArchiveFile,this); */
+                    /* TODO archiveReader.processWSDLs(currentArchiveFile,this); */
                     /* AxisService service = archiveReader.createService(currentArchiveFile.getAbsolutePath());
*/
                     svc_grp = axis2_svc_grp_create_with_conf(env, 
                         dep_engine_impl->conf);
@@ -1519,6 +1519,11 @@
                     dep_engine_impl->curr_file = NULL;
                     break;
                 case AXIS2_MODULE:
+                    if(dep_engine_impl->arch_reader)
+                    {
+                        AXIS2_ARCH_READER_FREE(dep_engine_impl->arch_reader, env);
+                        dep_engine_impl->arch_reader = NULL;
+                    }
                     dep_engine_impl->arch_reader = axis2_arch_reader_create(env);
                     meta_data = axis2_module_desc_create(env);
                     file_name = AXIS2_ARCH_FILE_DATA_GET_NAME(dep_engine_impl->

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=380650&r1=380649&r2=380650&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Fri Feb 24 03:59:41 2006
@@ -561,14 +561,13 @@
                 }
                 AXIS2_FREE((*env)->allocator, bool_val);
             }
-            if(qname)
-                AXIS2_QNAME_FREE(qname, env);
             index_i = axis2_hash_next (env, index_i);
         }
         
         param_qname = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
         params = AXIS2_OM_ELEMENT_GET_CHILDREN_WITH_QNAME(handler_element,
             env, param_qname, handler_node);
+        AXIS2_QNAME_FREE(param_qname, env);
         status = axis2_desc_builder_process_params(desc_builder, env, params, 
             handler_desc->param_container, parent);
         if(AXIS2_SUCCESS != status)
@@ -623,13 +622,15 @@
             AXIS2_OM_CHILDREN_QNAME_ITERATOR_NEXT(params, env);
         param_element = AXIS2_OM_NODE_GET_DATA_ELEMENT(param_node, env);
         param = axis2_param_create(env, NULL, NULL);
-        /* Setting param_element */
-        status = AXIS2_PARAM_SET_ELEMENT(param, env, param_node);
+        /* TODO Setting param_element. Do not set element like following.
+         * break it and set 
+         */
+        /*status = AXIS2_PARAM_SET_ELEMENT(param, env, param_node);
         if(AXIS2_SUCCESS != status)
         {
             AXIS2_PARAM_FREE(param, env);
             return status;
-        }
+        }*/
         /* Setting paramter name */
         att_qname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
         para_name = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(param_element, env, 
@@ -653,6 +654,8 @@
             param_node, &para_node);
         if(NULL != para_value)
         {
+            /* TODO uncomment this when find usages */
+            /*
             status = AXIS2_PARAM_SET_VALUE(param, env, param_element);
             if(AXIS2_SUCCESS != status)
             {
@@ -660,11 +663,16 @@
                 return AXIS2_FAILURE;
             }
             AXIS2_PARAM_SET_PARAM_TYPE(param, env, AXIS2_DOM_PARAM);
+            */
         }
         else
         {
-            axis2_char_t *para_test_value = AXIS2_OM_ELEMENT_GET_TEXT(
+            axis2_char_t *para_test_value = NULL;
+            axis2_char_t *temp = NULL;
+
+            temp = AXIS2_OM_ELEMENT_GET_TEXT(
                 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)
             {

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=380650&r1=380649&r2=380650&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Fri Feb 24 03:59:41 2006
@@ -510,18 +510,13 @@
 	op_impl->op.ops->set_msg_recv = axis2_op_set_msg_recv;
 	op_impl->op.ops->get_msg_recv = axis2_op_get_msg_recv;
     op_impl->op.ops->set_qname = axis2_op_set_qname;
-	op_impl->op.ops->get_qname = axis2_op_get_qname;
-    
+	op_impl->op.ops->get_qname = axis2_op_get_qname; 
 	op_impl->op.ops->set_msg_exchange_pattern 
-		= axis2_op_set_msg_exchange_pattern;
-    
+		= axis2_op_set_msg_exchange_pattern; 
 	op_impl->op.ops->get_msg_exchange_pattern
 		= axis2_op_get_msg_exchange_pattern;
-        
     op_impl->op.ops->set_style = axis2_op_set_style;
-    
 	op_impl->op.ops->get_style = axis2_op_get_style; 
-
     op_impl->op.ops->engage_module = axis2_op_engage_module;
     op_impl->op.ops->add_to_engage_module_list = axis2_op_add_to_engage_module_list;
     op_impl->op.ops->get_modules = axis2_op_get_modules;
@@ -646,25 +641,6 @@
         op->ops = NULL;
     }
     
-    if(NULL != op->param_container)
-    {
-	    AXIS2_PARAM_CONTAINER_FREE(op->param_container, env);
-        op->param_container = NULL;
-    }
-    
-    if(NULL != op_impl->wsdl_op)
-    {
-	    AXIS2_WSDL_OP_FREE(op_impl->wsdl_op, env);
-        op_impl->wsdl_op = NULL;
-    }
-    
-    op_impl->parent = NULL;
-    if(op_impl->msg_recv)
-    {
-        AXIS2_MSG_RECV_FREE(op_impl->msg_recv, env);
-        op_impl->msg_recv = NULL;
-    }
-
     if(NULL != op_impl->remaining_phases_inflow && 
         (0 != AXIS2_STRCMP(op_name, "TemplateOperation")))
     {
@@ -709,7 +685,8 @@
         op_impl->phases_outflow = NULL;
     }
     
-    if(NULL != op_impl->phases_in_fault_flow)
+    if(NULL != op_impl->phases_in_fault_flow &&
+        (0 != AXIS2_STRCMP(op_name, "TemplateOperation")))
     {
         int i = 0;
         int size = 0;
@@ -729,7 +706,8 @@
         op_impl->phases_in_fault_flow = NULL;
     }
     
-    if(NULL != op_impl->phases_out_fault_flow)
+    if(NULL != op_impl->phases_out_fault_flow &&
+        (0 != AXIS2_STRCMP(op_name, "TemplateOperation")))
     {
         int i = 0;
         int size = 0;
@@ -748,6 +726,25 @@
         AXIS2_ARRAY_LIST_FREE(op_impl->phases_out_fault_flow, env);
         op_impl->phases_out_fault_flow = NULL;
     }
+
+    if(NULL != op->param_container)
+    {
+	    AXIS2_PARAM_CONTAINER_FREE(op->param_container, env);
+        op->param_container = NULL;
+    }
+    
+    if(NULL != op_impl->wsdl_op)
+    {
+	    AXIS2_WSDL_OP_FREE(op_impl->wsdl_op, env);
+        op_impl->wsdl_op = NULL;
+    }
+    
+    op_impl->parent = NULL;
+    if(op_impl->msg_recv)
+    {
+        AXIS2_MSG_RECV_FREE(op_impl->msg_recv, env);
+        op_impl->msg_recv = NULL;
+    } 
     
     if(NULL != op_impl->modulerefs)
     {

Modified: webservices/axis2/trunk/c/modules/core/description/param.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/param.c?rev=380650&r1=380649&r2=380650&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/param.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/param.c Fri Feb 24 03:59:41 2006
@@ -16,6 +16,7 @@
 
 #include <axis2_param.h>
 #include <axis2.h>
+#include <axis2_string.h>
 
 typedef struct axis2_param_impl_s
 {
@@ -165,7 +166,7 @@
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
-    AXIS2_INTF_TO_IMPL(param)->name = name; /* shallow copy */
+    AXIS2_INTF_TO_IMPL(param)->name = AXIS2_STRDUP(name, env);
     return AXIS2_SUCCESS;
 }
 
@@ -176,7 +177,7 @@
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
-    AXIS2_INTF_TO_IMPL(param)->value = value; /* shallow copy */
+    AXIS2_INTF_TO_IMPL(param)->value = value;
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c?rev=380650&r1=380649&r2=380650&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c Fri Feb 24 03:59:41 2006
@@ -66,6 +66,7 @@
     
     /* handler desc of base handler */
     handler_desc = axis2_handler_desc_create_with_qname(env, handler_qname);
+    AXIS2_QNAME_FREE(handler_qname, env);
     if (!handler_desc)
     {
         AXIS2_HANDLER_FREE(handler, env);

Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c?rev=380650&r1=380649&r2=380650&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c Fri Feb 24 03:59:41 2006
@@ -266,12 +266,6 @@
     
     wsdl_op_impl = AXIS2_INTF_TO_IMPL(wsdl_op);
     
-    if(NULL != wsdl_op->ops)
-    {
-        AXIS2_FREE((*env)->allocator, wsdl_op->ops);
-        wsdl_op->ops = NULL;
-    }
-    
     if(NULL != wsdl_op->extensible_component)
     {
         AXIS2_WSDL_EXTENSIBLE_COMPONENT_FREE(wsdl_op->extensible_component, env);
@@ -326,7 +320,7 @@
     
     if(NULL != wsdl_op_impl->name)
     {
-        AXIS2_FREE((*env)->allocator, wsdl_op_impl->name);
+        AXIS2_QNAME_FREE(wsdl_op_impl->name, env);
         wsdl_op_impl->name = NULL;
     }
     
@@ -336,6 +330,12 @@
         wsdl_op_impl->style = NULL;
     }
     
+    if(NULL != wsdl_op->ops)
+    {
+        AXIS2_FREE((*env)->allocator, wsdl_op->ops);
+        wsdl_op->ops = NULL;
+    }
+    
     if(wsdl_op_impl)
     {
         AXIS2_FREE((*env)->allocator, wsdl_op_impl);
@@ -408,7 +408,7 @@
 	
     if(wsdl_op_impl->name)
     {
-        AXIS2_FREE((*env)->allocator, wsdl_op_impl->name);
+        AXIS2_QNAME_FREE(wsdl_op_impl->name, env);
         wsdl_op_impl->name = NULL;
     }
 	wsdl_op_impl->name = AXIS2_QNAME_CLONE(name, env);
@@ -419,7 +419,6 @@
     
 	return AXIS2_SUCCESS;
 }
-
 
 axis2_qname_t * AXIS2_CALL 
 axis2_wsdl_op_get_qname (void *wsdl_op, 



Mime
View raw message