svn commit: r1174619 - in /axis/axis2/c/core/trunk: guththila/src/guththila_xml_writer.c src/core/deployment/dep_engine.c src/core/engine/conf.c

[damitha]

Author: damitha
Date: Fri Sep 23 09:38:44 2011
New Revision: 1174619

URL: http://svn.apache.org/viewvc?rev=1174619&view=rev
Log:
Please refer to 
https://issues.apache.org/jira/browse/AXIS2C-1561

Modified:
    axis/axis2/c/core/trunk/guththila/src/guththila_xml_writer.c
    axis/axis2/c/core/trunk/src/core/deployment/dep_engine.c
    axis/axis2/c/core/trunk/src/core/engine/conf.c

Modified: axis/axis2/c/core/trunk/guththila/src/guththila_xml_writer.c
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/guththila/src/guththila_xml_writer.c?rev=1174619&r1=1174618&r2=1174619&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/guththila/src/guththila_xml_writer.c (original)
+++ axis/axis2/c/core/trunk/guththila/src/guththila_xml_writer.c Fri Sep 23 
09:38:44 2011
@@ -1755,6 +1755,11 @@ guththila_write_empty_element_with_prefi
             guththila_stack_push(&wr->namesp, namesp, env);
             elem->name_sp_stack_no = GUTHTHILA_STACK_TOP_INDEX(wr->namesp);
         }
+        else 
+        {
+            AXIS2_FREE(env->allocator, namesp);
+            namesp = NULL;
+        }
 
 #ifndef GUTHTHILA_XML_WRITER_TOKEN
         elem->name = strdup(local_name);

Modified: axis/axis2/c/core/trunk/src/core/deployment/dep_engine.c
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/deployment/dep_engine.c?rev=1174619&r1=1174618&r2=1174619&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/deployment/dep_engine.c (original)
+++ axis/axis2/c/core/trunk/src/core/deployment/dep_engine.c Fri Sep 23 
09:38:44 2011
@@ -903,6 +903,7 @@ axis2_dep_engine_load_client(
             "No memory. Allocation for Axis2 Configuration failed");
         return NULL;
     }
+    axis2_conf_set_dep_engine(dep_engine->conf, env, dep_engine);
     dep_engine->conf_builder = 
axis2_conf_builder_create_with_file_and_dep_engine_and_conf(env,
         dep_engine->conf_name, dep_engine, dep_engine->conf);
 
@@ -1789,7 +1790,7 @@ axis2_dep_engine_build_module(
             module->handler_create_func_map);
     }
 
-    dep_engine->curr_file = NULL;
+    /*dep_engine->curr_file = NULL;*/
 
     return module_desc;
 }

Modified: axis/axis2/c/core/trunk/src/core/engine/conf.c
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/engine/conf.c?rev=1174619&r1=1174618&r2=1174619&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/engine/conf.c (original)
+++ axis/axis2/c/core/trunk/src/core/engine/conf.c Fri Sep 23 09:38:44 2011
@@ -1471,14 +1471,15 @@ axis2_conf_engage_module(
 
         axutil_file_set_path(file, env, path);
         file_data = axis2_arch_file_data_create_with_type_and_file(env, 
AXIS2_MODULE, file);
-        if(!flag)
+        /*if(!flag)
         {
             dep_engine = axis2_dep_engine_create_with_repos_name(env, 
repos_path);
         }
         else
         {
             dep_engine = axis2_dep_engine_create_with_axis2_xml(env, 
axis2_xml);
-        }
+        }*/
+        dep_engine = conf->dep_engine;
 
         axis2_dep_engine_set_current_file_item(dep_engine, env, file_data);
 
@@ -1892,4 +1893,4 @@ axis2_conf_disengage_module(
     }
 
        return AXIS2_FAILURE;
-}
\ No newline at end of file
+}