summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorGravatar damitha2011-09-23 09:38:44 +0000
committerGravatar damitha2011-09-23 09:38:44 +0000
commit353bd64960b39ede863e093250aa128261a292a3 (patch)
tree2d37d203f547f1d0cd59f47bd1fc79bad79cd9a0 /src/core
parent7bf2ba12647b1669cf2984c70ddccf33092cae5c (diff)
downloadaxis2c-353bd64960b39ede863e093250aa128261a292a3.tar.gz
axis2c-353bd64960b39ede863e093250aa128261a292a3.tar.bz2
Please refer to
https://issues.apache.org/jira/browse/AXIS2C-1561 git-svn-id: http://svn.apache.org/repos/asf/axis/axis2/c/core/trunk@1174619 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/core')
-rw-r--r--src/core/deployment/dep_engine.c3
-rw-r--r--src/core/engine/conf.c7
2 files changed, 6 insertions, 4 deletions
diff --git a/src/core/deployment/dep_engine.c b/src/core/deployment/dep_engine.c
index 260b464..f285fb7 100644
--- a/src/core/deployment/dep_engine.c
+++ b/src/core/deployment/dep_engine.c
@@ -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;
}
diff --git a/src/core/engine/conf.c b/src/core/engine/conf.c
index 9efb102..ef5e941 100644
--- a/src/core/engine/conf.c
+++ b/src/core/engine/conf.c
@@ -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
+}