You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2008/06/27 13:42:55 UTC
svn commit: r672248 - in /webservices/axis2/trunk/c/src/core:
deployment/dep_engine.c deployment/repos_listener.c engine/conf.c
Author: damitha
Date: Fri Jun 27 04:42:54 2008
New Revision: 672248
URL: http://svn.apache.org/viewvc?rev=672248&view=rev
Log:
Adding useful code comments
Modified:
webservices/axis2/trunk/c/src/core/deployment/dep_engine.c
webservices/axis2/trunk/c/src/core/deployment/repos_listener.c
webservices/axis2/trunk/c/src/core/engine/conf.c
Modified: webservices/axis2/trunk/c/src/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/deployment/dep_engine.c?rev=672248&r1=672247&r2=672248&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/src/core/deployment/dep_engine.c Fri Jun 27 04:42:54 2008
@@ -669,27 +669,27 @@
AXIS2_PARAM_CHECK (env->error, dep_engine, AXIS2_FAILURE);
- para_hot_dep = axis2_conf_get_param(dep_engine->conf, env,
- AXIS2_HOTDEPLOYMENT);
- para_hot_update = axis2_conf_get_param(dep_engine->conf, env,
- AXIS2_HOTUPDATE);
+ para_hot_dep = axis2_conf_get_param(dep_engine->conf, env, AXIS2_HOTDEPLOYMENT);
+ para_hot_update = axis2_conf_get_param(dep_engine->conf, env, AXIS2_HOTUPDATE);
if (para_hot_dep)
{
value = (axis2_char_t *) axutil_param_get_value(para_hot_dep, env);
- if (0 == axutil_strcasecmp("false", value))
+ if (0 == axutil_strcasecmp(AXIS2_VALUE_FALSE, value))
{
dep_engine->hot_dep = AXIS2_FALSE;
}
}
+
if (para_hot_update)
{
value = (axis2_char_t *) axutil_param_get_value(para_hot_update, env);
- if (0 == axutil_strcasecmp("false", value))
+ if (0 == axutil_strcasecmp(AXIS2_VALUE_FALSE, value))
{
dep_engine->hot_update = AXIS2_FALSE;
}
}
+
return AXIS2_SUCCESS;
}
@@ -719,55 +719,45 @@
return NULL;
}
- /* Set a flag to mark that conf is created using axis2 xml.
- * To find out that conf is build using axis2 xml , this flag can be used.
+ /* Set a flag to mark that conf is created using axis2 xml. To find out that conf is build using
+ * axis2 xml , this flag can be used.
*/
axis2_conf_set_axis2_flag (dep_engine->conf, env, dep_engine->file_flag);
axis2_conf_set_axis2_xml (dep_engine->conf, env, dep_engine->conf_name);
- 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);
+ 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);
+
if (!(dep_engine->conf_builder))
{
axis2_conf_free(dep_engine->conf, env);
- AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI,
- "Configuration builder creation failed");
+ AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI, "Configuration builder creation failed");
dep_engine->conf = NULL;
}
- /* Only after populating we will be able to access parameters in
- * the axis2.xml
+ /* Populate the axis2 configuration from reading axis2.xml.
*/
-
status = axis2_conf_builder_populate_conf(dep_engine->conf_builder, env);
if (AXIS2_SUCCESS != status)
{
axis2_conf_free(dep_engine->conf, env);
dep_engine->conf = NULL;
- AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI,
- "Populating Axis2 Configuration failed");
+ AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI, "Populating Axis2 Configuration failed");
return NULL;
}
status = axis2_dep_engine_set_svc_and_module_dir_path (dep_engine, env);
if (AXIS2_SUCCESS != status)
{
- AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI,
- "Setting service and module directory paths failed");
+ AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI, "Setting service and module directory paths failed");
return NULL;
}
status = axis2_dep_engine_set_dep_features(dep_engine, env);
if (AXIS2_SUCCESS != status)
{
- AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI,
- "Setting deployment features failed");
+ AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI, "Setting deployment features failed");
return NULL;
}
@@ -776,77 +766,75 @@
axis2_repos_listener_free(dep_engine->repos_listener, env);
}
- dep_engine->repos_listener =
- axis2_repos_listener_create_with_folder_name_and_dep_engine(env,
- dep_engine->
- folder_name,
- dep_engine);
+ dep_engine->repos_listener = axis2_repos_listener_create_with_folder_name_and_dep_engine(env,
+ dep_engine->folder_name, dep_engine);
+
if (!dep_engine->repos_listener)
{
axis2_conf_free(dep_engine->conf, env);
dep_engine->conf = NULL;
+
AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI,
- "dep_engine repos listener creation failed, folder name is %s",
- dep_engine->folder_name);
+ "dep_engine repos listener creation failed, folder name is %s", dep_engine->folder_name);
+
return NULL;
}
+
axis2_conf_set_repo(dep_engine->conf, env, dep_engine->axis2_repos);
- axis2_core_utils_calculate_default_module_version(env,
- axis2_conf_get_all_modules
- (dep_engine->conf, env),
- dep_engine->conf);
- status =
- axis2_dep_engine_validate_system_predefined_phases(dep_engine, env);
+ axis2_core_utils_calculate_default_module_version(env, axis2_conf_get_all_modules(
+ dep_engine->conf, env), dep_engine->conf);
+
+ status = axis2_dep_engine_validate_system_predefined_phases(dep_engine, env);
if (AXIS2_SUCCESS != status)
{
axis2_repos_listener_free(dep_engine->repos_listener, env);
axis2_conf_free(dep_engine->conf, env);
dep_engine->conf = NULL;
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_VALIDATION_FAILED,
- AXIS2_FAILURE);
- AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI,
- "Validating system predefined phases failed");
+
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_VALIDATION_FAILED, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI, "Validating system predefined phases failed");
+
return NULL;
}
- status = axis2_conf_set_phases_info(dep_engine->conf, env,
- dep_engine->phases_info);
+ status = axis2_conf_set_phases_info(dep_engine->conf, env, dep_engine->phases_info);
if (AXIS2_SUCCESS != status)
{
axis2_repos_listener_free(dep_engine->repos_listener, env);
axis2_conf_free(dep_engine->conf, env);
dep_engine->conf = NULL;
- AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI,
- "Setting phases info into Axis2 Configuration failed");
+
+ AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI, "Setting phases info into Axis2 Configuration failed");
+
return NULL;
}
- out_fault_phases =
- axis2_phases_info_get_op_out_faultphases(dep_engine->phases_info, env);
+ out_fault_phases = axis2_phases_info_get_op_out_faultphases(dep_engine->phases_info, env);
if (out_fault_phases)
{
axis2_conf_set_out_fault_phases(dep_engine->conf, env, out_fault_phases);
}
+
if (AXIS2_SUCCESS != status)
{
axis2_repos_listener_free(dep_engine->repos_listener, env);
axis2_conf_free(dep_engine->conf, env);
dep_engine->conf = NULL;
- AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI,
- "Setting out fault phases into Axis2 Configuratin failed");
+
+ AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI, "Setting out fault phases into Axis2 Configuratin failed");
+
return NULL;
}
status = axis2_dep_engine_engage_modules(dep_engine, env);
if (AXIS2_SUCCESS != status)
{
- AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI,
- "dep engine failed to engaged_modules");
+ AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI, "dep engine failed to engaged_modules");
axis2_conf_free(dep_engine->conf, env);
dep_engine->conf = NULL;
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_VALIDATION_FAILED,
- AXIS2_FAILURE);
+
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_VALIDATION_FAILED, AXIS2_FAILURE);
return NULL;
}
@@ -1105,6 +1093,7 @@
phase2 = (axis2_char_t *) axutil_array_list_get(in_phases, env, 2);
phase3 = (axis2_char_t *) axutil_array_list_get(in_phases, env, 3);
}
+
if ((phase0 && 0 != axutil_strcmp(phase0, AXIS2_PHASE_TRANSPORT_IN)) ||
(phase1 && 0 != axutil_strcmp(phase1, AXIS2_PHASE_PRE_DISPATCH)) ||
(phase2 && 0 != axutil_strcmp(phase2, AXIS2_PHASE_DISPATCH)) ||
@@ -1117,6 +1106,12 @@
return AXIS2_SUCCESS;
}
+/* For each searvices belonging to the service group passed as parameter,
+ * 1) Modules defined to be engaged to passed service group are engaged.
+ * 2) Modules defined to be engaged to service are engaged.
+ *
+ * Then for each service operation modules defined to be engaged to that operation are engaged.
+ */
static axis2_status_t
axis2_dep_engine_add_new_svc(
axis2_dep_engine_t * dep_engine,
@@ -1184,7 +1179,7 @@
}
}
- /* Modules from <service> */
+ /* Modules from service */
list = axis2_svc_get_all_module_qnames(svc, env);
sizej = axutil_array_list_size(list, env);
for (j = 0; j < sizej; j++)
@@ -1268,6 +1263,9 @@
return axis2_conf_add_svc_grp(dep_engine->conf, env, svc_metadata);
}
+/* Here we will load the actual module implementation dll using the class loader and store it in
+ * module description.
+ */
static axis2_status_t
axis2_dep_engine_load_module_dll(
axis2_dep_engine_t * dep_engine,
@@ -1289,11 +1287,9 @@
AXIS2_PARAM_CHECK(env->error, module_desc, AXIS2_FAILURE);
AXIS2_PARAM_CHECK (env->error, dep_engine, AXIS2_FAILURE);
- read_in_dll =
- axis2_arch_file_data_get_module_dll_name(dep_engine->curr_file, env);
+ read_in_dll = axis2_arch_file_data_get_module_dll_name(dep_engine->curr_file, env);
dll_desc = axutil_dll_desc_create(env);
- dll_name = axutil_dll_desc_create_platform_specific_dll_name(dll_desc, env,
- read_in_dll);
+ dll_name = axutil_dll_desc_create_platform_specific_dll_name(dll_desc, env, read_in_dll);
module_folder = axis2_arch_file_data_get_file(dep_engine->curr_file, env);
timestamp = axutil_file_get_timestamp(module_folder, env);
@@ -1301,9 +1297,9 @@
module_folder_path = axutil_file_get_path(module_folder, env);
temp_path = axutil_stracat(env, module_folder_path, AXIS2_PATH_SEP_STR);
dll_path = axutil_stracat(env, temp_path, dll_name);
+
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "axis2_dep_engine_load_module_dll: DLL path is : %s",
- dll_path);
+ "axis2_dep_engine_load_module_dll: DLL path is : %s", dll_path);
status = axutil_dll_desc_set_name(dll_desc, env, dll_path);
if (AXIS2_SUCCESS != status)
{
@@ -1321,19 +1317,22 @@
axutil_dll_desc_set_type(dll_desc, env, AXIS2_MODULE_DLL);
impl_info_param = axutil_param_create(env, read_in_dll, NULL);
axutil_param_set_value(impl_info_param, env, dll_desc);
- axutil_param_set_value_free(impl_info_param, env,
- axutil_dll_desc_free_void_arg);
+ axutil_param_set_value_free(impl_info_param, env, axutil_dll_desc_free_void_arg);
axutil_class_loader_init(env);
- module = (axis2_module_t *) axutil_class_loader_create_dll(env,
- impl_info_param);
+ module = (axis2_module_t *) axutil_class_loader_create_dll(env, impl_info_param);
+
/* We cannot free the created impl_info_param here because by freeing
* so, it will free dll_desc which in turn unload the module. So we
* add this as a param to module_desc
*/
axis2_module_desc_add_param(module_desc, env, impl_info_param);
+
return axis2_module_desc_set_module(module_desc, env, module);
}
+/* For each handler description of the module flow take the corresponding handler create function
+ * from handler_create_func_map and create the handler instance for the handler description.
+ */
static axis2_status_t
axis2_dep_engine_add_module_flow_handlers(
axis2_dep_engine_t * dep_engine,
@@ -1357,14 +1356,14 @@
handlermd = axis2_flow_get_handler(flow, env, j);
handler_name = axis2_handler_desc_get_name(handlermd, env);
- handler_create_func = axutil_hash_get(handler_create_func_map,
- axutil_string_get_buffer
- (handler_name, env),
- AXIS2_HASH_KEY_STRING);
+ handler_create_func = axutil_hash_get(handler_create_func_map, axutil_string_get_buffer(
+ handler_name, env), AXIS2_HASH_KEY_STRING);
+
handler = handler_create_func(env, handler_name);
axis2_handler_init(handler, env, handlermd);
axis2_handler_desc_set_handler(handlermd, env, handler);
}
+
return AXIS2_SUCCESS;
}
@@ -1397,6 +1396,11 @@
return handler;
}
+/* Caller has module description filled with the information in module.xml by the time this
+ * function is called. Now it will load the actual module implementation and fill the module
+ * flows with the actual handler instances. Finally module description will be added into the
+ * configuration module list.
+ */
static axis2_status_t
axis2_dep_engine_add_new_module(
axis2_dep_engine_t * dep_engine,
@@ -1417,62 +1421,66 @@
module_qname = axis2_module_desc_get_qname(module_metadata, env);
module_name = axutil_qname_get_localpart(module_qname, env);
status = axis2_dep_engine_load_module_dll(dep_engine, env, module_metadata);
+
if (AXIS2_SUCCESS != status)
{
- AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI,
- "Loading module description %s failed", module_name);
+ AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI, "Loading module description %s failed",
+ module_name);
+
return status;
}
+
module = axis2_module_desc_get_module(module_metadata, env);
if (!module)
{
AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI,
- "Retrieving module from module description %s failed", module_name);
+ "Retrieving module from module description %s failed", module_name);
+
return AXIS2_FAILURE;
}
+
+ /* Module implementor will provide functions for creating his handlers and by calling this
+ * function these function pointers will be stored in a hash map in the module.
+ */
status = axis2_module_fill_handler_create_func_map(module, env);
if (AXIS2_SUCCESS != status)
{
AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI,
- "Filling handler create function for module map %s failed",
- module_name);
+ "Filling handler create function for module map %s failed", module_name);
return status;
}
in_flow = axis2_module_desc_get_in_flow(module_metadata, env);
if (in_flow)
{
- axis2_dep_engine_add_module_flow_handlers(dep_engine, env, in_flow,
- module->
- handler_create_func_map);
+ axis2_dep_engine_add_module_flow_handlers(dep_engine, env, in_flow,
+ module->handler_create_func_map);
}
out_flow = axis2_module_desc_get_out_flow(module_metadata, env);
if (out_flow)
{
- axis2_dep_engine_add_module_flow_handlers(dep_engine, env, out_flow,
- module->
- handler_create_func_map);
+ axis2_dep_engine_add_module_flow_handlers(dep_engine, env, out_flow,
+ module->handler_create_func_map);
}
in_fault_flow = axis2_module_desc_get_fault_in_flow(module_metadata, env);
if (in_fault_flow)
{
- axis2_dep_engine_add_module_flow_handlers(dep_engine, env,
- in_fault_flow,
- module->
- handler_create_func_map);
+ axis2_dep_engine_add_module_flow_handlers(dep_engine, env, in_fault_flow,
+ module->handler_create_func_map);
}
out_fault_flow = axis2_module_desc_get_fault_out_flow(module_metadata, env);
if (out_fault_flow)
{
- axis2_dep_engine_add_module_flow_handlers(dep_engine, env,
- out_fault_flow,
- module->
- handler_create_func_map);
+ axis2_dep_engine_add_module_flow_handlers(dep_engine, env, out_fault_flow,
+ module->handler_create_func_map);
}
+ /* Add the module description into the axis2 configuration. Axis2 configuration will keep these
+ * handlers in a hash_map called all_modules.
+ */
axis2_conf_add_module(dep_engine->conf, env, module_metadata);
return AXIS2_SUCCESS;
@@ -1784,6 +1792,10 @@
}
module = axis2_module_desc_get_module(module_desc, env);
+
+ /* Module implementor will provide functions for creating his handlers and by calling this
+ * function these function pointers will be stored in a hash map in the module.
+ */
axis2_module_fill_handler_create_func_map(module, env);
in_flow = axis2_module_desc_get_in_flow(module_desc, env);
Modified: webservices/axis2/trunk/c/src/core/deployment/repos_listener.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/deployment/repos_listener.c?rev=672248&r1=672247&r2=672248&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/deployment/repos_listener.c (original)
+++ webservices/axis2/trunk/c/src/core/deployment/repos_listener.c Fri Jun 27 04:42:54 2008
@@ -87,8 +87,7 @@
axis2_conf_t *conf;
axis2_bool_t file_flag;
- repos_listener =
- (axis2_repos_listener_t *) axis2_repos_listener_create(env);
+ repos_listener = (axis2_repos_listener_t *) axis2_repos_listener_create(env);
if (!repos_listener)
{
@@ -107,8 +106,7 @@
}
}
- repos_listener->info_list =
- axis2_ws_info_list_create_with_dep_engine(env, dep_engine);
+ repos_listener->info_list = axis2_ws_info_list_create_with_dep_engine(env, dep_engine);
if (!repos_listener->info_list)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Creating ws info list failed");
@@ -123,7 +121,8 @@
if (!conf)
{
AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI,
- "Deployment engines axis2 configuration not available");
+ "Deployment engines axis2 configuration not available");
+
return NULL;
}
axis2_repos_listener_set_conf (repos_listener, env, conf);
@@ -131,10 +130,9 @@
status = axis2_repos_listener_init(repos_listener, env);
if (AXIS2_SUCCESS != status)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_REPOS_LISTENER_INIT_FAILED,
- AXIS2_FAILURE);
- AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI,
- "Repository listener initialization failed");
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_REPOS_LISTENER_INIT_FAILED, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI, "Repository listener initialization failed");
+
return NULL;
}
return repos_listener;
Modified: webservices/axis2/trunk/c/src/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/engine/conf.c?rev=672248&r1=672247&r2=672248&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/src/core/engine/conf.c Fri Jun 27 04:42:54 2008
@@ -32,18 +32,22 @@
axis2_transport_out_desc_t *transports_out[AXIS2_TRANSPORT_ENUM_MAX];
/**
- * Field modules
+ * All the modules already engaged can be found here.
*/
axutil_array_list_t *engaged_module_list;
+
/*To store all the available modules (including version) */
axutil_hash_t *all_modules;
+
/*To store mapping between default version to module name */
axutil_hash_t *name_to_version_map;
axutil_array_list_t *out_phases;
axutil_array_list_t *in_fault_phases;
axutil_array_list_t *out_fault_phases;
+ /* All the system specific phases are stored here */
axutil_array_list_t *in_phases_upto_and_including_post_dispatch;
+
axis2_phases_info_t *phases_info;
axutil_hash_t *all_svcs;
axutil_hash_t *all_init_svcs;
@@ -90,20 +94,19 @@
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "No memory");
return NULL;
}
+
memset ((void *)conf, 0, sizeof (axis2_conf_t));
conf->enable_mtom = AXIS2_FALSE;
conf->enable_security = AXIS2_FALSE;
conf->axis2_flag = AXIS2_FALSE;
- conf->param_container = (axutil_param_container_t *)
- axutil_param_container_create(env);
+ conf->param_container = (axutil_param_container_t *) axutil_param_container_create(env);
if (!conf->param_container)
{
axis2_conf_free(conf, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Creating parameter container failed");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Creating parameter container failed");
return NULL;
}
@@ -112,8 +115,7 @@
{
axis2_conf_free(conf, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Creating service group map failed");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Creating service group map failed");
return NULL;
}
@@ -132,8 +134,7 @@
{
axis2_conf_free(conf, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Creating engaged module list failed");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Creating engaged module list failed");
return NULL;
}
@@ -142,8 +143,7 @@
{
axis2_conf_free(conf, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Creating handler list failed");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Creating handler list failed");
return NULL;
}
@@ -154,7 +154,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Creating in phases list upto and including post dispatch failed");
+ "Creating in phases list upto and including post dispatch failed");
return NULL;
}
@@ -168,13 +168,13 @@
{
axis2_conf_free(conf, env);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Creating phase %s failed",
- AXIS2_PHASE_TRANSPORT_IN);
+ AXIS2_PHASE_TRANSPORT_IN);
+
return NULL;
}
- /* Incase of using security we need to find the service/operation
- * parameters before the dispatch phase.
- * This is required to give parameters to the security inflow.*/
+ /* In case of using security we need to find the service/operation parameters before the
+ * dispatch phase. This is required to give parameters to the security inflow.*/
uri_dispatch = axis2_req_uri_disp_create(env);
if (uri_dispatch)
@@ -210,6 +210,7 @@
return NULL;
}
+
phase = axis2_phase_create(env, AXIS2_PHASE_PRE_DISPATCH);
if (!phase)
{
@@ -1121,24 +1122,22 @@
axis2_module_desc_t *def_mod = NULL;
int i = 0;
int size = 0;
+
AXIS2_PARAM_CHECK(env->error, module_name, AXIS2_FALSE);
- def_mod = axis2_conf_get_default_module(conf, env,
- axutil_qname_get_localpart
- (module_name, env));
+ def_mod = axis2_conf_get_default_module(conf, env, axutil_qname_get_localpart(module_name, env));
if (def_mod)
{
def_mod_qname = axis2_module_desc_get_qname(def_mod, env);
}
+
size = axutil_array_list_size(conf->engaged_module_list, env);
for (i = 0; i < size; i++)
{
axutil_qname_t *qname = NULL;
- qname = (axutil_qname_t *) axutil_array_list_get(conf->
- engaged_module_list, env,
- i);
+ qname = (axutil_qname_t *) axutil_array_list_get(conf->engaged_module_list, env, i);
if (axutil_qname_equals(module_name, env, qname) ||
(def_mod_qname &&
@@ -1147,6 +1146,7 @@
return AXIS2_TRUE;
}
}
+
return AXIS2_FALSE;
}