axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r638437 - in /webservices/axis2/trunk/c: include/axis2_const.h src/core/deployment/axis2_deployment.h src/core/deployment/conf_builder.c src/core/engine/phase.c
Date Tue, 18 Mar 2008 16:47:01 GMT
Author: damitha
Date: Tue Mar 18 09:46:53 2008
New Revision: 638437

URL: http://svn.apache.org/viewvc?rev=638437&view=rev
Log:
Adding meaningful log messages, modifying log messages to be meaningful, coding conventions

Modified:
    webservices/axis2/trunk/c/include/axis2_const.h
    webservices/axis2/trunk/c/src/core/deployment/axis2_deployment.h
    webservices/axis2/trunk/c/src/core/deployment/conf_builder.c
    webservices/axis2/trunk/c/src/core/engine/phase.c

Modified: webservices/axis2/trunk/c/include/axis2_const.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_const.h?rev=638437&r1=638436&r2=638437&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_const.h (original)
+++ webservices/axis2/trunk/c/include/axis2_const.h Tue Mar 18 09:46:53 2008
@@ -137,7 +137,7 @@
 #define AXIS2_LIST_SERVICE_FOR_MODULE_ENGAMNET "listop"
 
     /**
-     * List service for adminpagse
+     * List service for admin page
      */
 #define AXIS2_ADMIN_LISTSERVICES "listService"
 

Modified: webservices/axis2/trunk/c/src/core/deployment/axis2_deployment.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/deployment/axis2_deployment.h?rev=638437&r1=638436&r2=638437&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/deployment/axis2_deployment.h (original)
+++ webservices/axis2/trunk/c/src/core/deployment/axis2_deployment.h Tue Mar 18 09:46:53 2008
@@ -37,64 +37,44 @@
 {
 #endif
 
-    /*********************************** Constansts********************************/
+/*********************************** Constansts********************************/
 
-    /**
-     * DeployCons interface is to keep constent value required for Deployemnt
-     */
+/**
+ * DeployCons interface is to keep constent value required for Deployemnt
+ */
 
 #define AXIS2_SVC 0             /* if it is a service */
 #define AXIS2_MODULE 1          /* if it is a module */
 
-#define AXIS2_META_INF "META-INF"
 #define AXIS2_SVC_XML "services.xml"
-#define AXIS2_SVC_WSDL_NAME "service.wsdl"
-#define AXIS2_SVC_WSDL_WITH_FOLDER "META-INF/service.wsdl"
 #define AXIS2_MODULE_XML "module.xml"
 #define AXIS2_PARAMETERST "parameter"   /* paramater start tag */
-#define AXIS2_LISTENERST "listener" /* paramater start tag */
 #define AXIS2_HANDLERST "handler"
 #define AXIS2_MODULEST "module"
-#define AXIS2_MODULECONFIG "moduleConfig"
 #define AXIS2_PHASEST "phase"
 #define AXIS2_PHASE_ORDER "phaseOrder"
-#define AXIS2_TYPEMAPPINGST "typeMapping"   /* typeMapping start tag */
-#define AXIS2_BEANMAPPINGST "beanMapping"   /* beanMapping start tag */
 #define AXIS2_OPERATIONST "operation"   /* operation start tag */
 #define AXIS2_IN_FLOW_START "inflow"    /* inflow start tag */
 #define AXIS2_OUT_FLOW_START "outflow"  /* outflowr start tag */
 #define AXIS2_IN_FAILTFLOW "INfaultflow"    /* faultflow start tag */
 #define AXIS2_OUT_FAILTFLOW "Outfaultflow"  /* faultflow start tag */
 
-    /* #define AXIS2_FOLDE_NAME "D:/Axis 2.0/projects/Deployement/test-data" */
 #define AXIS2_MODULE_PATH "modules"
 #define AXIS2_SVC_PATH "services"
 
-    /* for jws file extension */
-#define AXIS2_JWS_EXTENSION ".jws"
-
-#define AXIS2_SVCTAG "service"
-#define AXIS2_CONFIG "axisconfig"
-
-    /* for serviemetadat */
-#define AXIS2_STYLENAME "style"
-#define AXIS2_CONTEXTPATHNAME "contextPath"
-
-    /* for parameters */
+/* for parameters */
 #define AXIS2_ATTNAME "name"
 #define AXIS2_ATTLOCKED "locked"
 #define AXIS2_TYPE "type"
 
-    /* for operatiins */
-#define AXIS2_ATQNAME "name"
-#define AXIS2_ATUSE "use"
+/* for operations */
 #define AXIS2_MEP "mep"
 
-    /* for messages */
+/* for messages */
 #define AXIS2_MESSAGE "message"
 #define AXIS2_LABEL "label"
 
-    /* for handlers */
+/* for handlers */
 #define AXIS2_REF "ref"
 #define AXIS2_CLASSNAME "class"
 #define AXIS2_BEFORE "before"
@@ -105,8 +85,6 @@
 #define AXIS2_ORDER "order"     /* to resolve the order tag */
 #define AXIS2_DESCRIPTION "description"
 
-#define AXIS2_TRANSPORTSTAG "transports"
-#define AXIS2_TRANSPORTTAG "transport"
 #define AXIS2_TRANSPORTSENDER "transportSender"
 #define AXIS2_TRANSPORTRECEIVER "transportReceiver"
 
@@ -114,13 +92,10 @@
 
 #define AXIS2_HOTDEPLOYMENT "hotdeployment"
 #define AXIS2_HOTUPDATE "hotupdate"
-#define AXIS2_EXTRACTSVCARCHIVE "extractServiceArchive"
 #define AXIS2_DISPATCH_ORDER "dispatchOrder"
 #define AXIS2_DISPATCHER "dispatcher"
 
-#define AXIS2_STORAGE "axisStorage"
-
-    /* element in a services.xml */
+/* element in a services.xml */
 #define AXIS2_SVC_ELEMENT "service"
 #define AXIS2_SVC_WSDL_PATH "wsdl_path"
 #define AXIS2_SVC_GRP_ELEMENT "serviceGroup"
@@ -130,16 +105,12 @@
 #define AXIS2_MODULE_FOLDER "modules"
 #define AXIS2_SERVICE_FOLDER "services"
 #define AXIS2_LIB_FOLDER "lib"
-
-    /* this param contain the dll_desc as value. dll_desc contain the loaded
-     * msg recv library handler
-     */
-#define AXIS2_MSG_RECV_PARAM "msg_recv_param"
+#define AXIS2_LIB_DIR "libDir"
 
 #define AXIS2_ATTRIBUTE_DEFAULT_VERSION "version"
 #define AXIS2_DEFAULT_MODULE_VERSION "defaultModuleVersions"
 
-    /*********************************** Constants*********************************/
+/*********************************** Constants*********************************/
 
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/src/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/deployment/conf_builder.c?rev=638437&r1=638436&r2=638437&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/src/core/deployment/conf_builder.c Tue Mar 18 09:46:53 2008
@@ -152,6 +152,8 @@
     axis2_status_t status = AXIS2_FAILURE;
     axutil_param_t *param = NULL;
 
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, 
+        "Entry:axis2_conf_builder_populate_conf");
     conf_node = axis2_desc_builder_build_om(conf_builder->desc_builder, env);
     if (!conf_node)
     {
@@ -277,7 +279,6 @@
         return AXIS2_FAILURE;
     }
 
-
     /* processing Phase orders */
     qphaseorder = axutil_qname_create(env, AXIS2_PHASE_ORDER, NULL, NULL);
     phase_orders = axiom_element_get_children_with_qname(conf_element, env,
@@ -293,7 +294,6 @@
         return AXIS2_FAILURE;
     }
 
-
     /* Processing default module versions */
     qdefmodver = axutil_qname_create(env, AXIS2_DEFAULT_MODULE_VERSION, NULL,
                                      NULL);
@@ -326,11 +326,11 @@
         if (value)
         {
             axis2_conf_set_enable_mtom(conf_builder->conf, env,
-                                       (axutil_strcmp(value, AXIS2_VALUE_TRUE)
-                                        == 0));
+                                       (!axutil_strcmp(value, AXIS2_VALUE_TRUE)));
         }
     }
-
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, 
+        "Exit:axis2_conf_builder_populate_conf");
     return AXIS2_SUCCESS;
 }
 
@@ -341,6 +341,8 @@
     axiom_children_qname_iterator_t * module_refs)
 {
     axis2_status_t status = AXIS2_SUCCESS;
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, 
+        "Entry:axis2_conf_builder_process_module_refs");
     AXIS2_PARAM_CHECK(env->error, module_refs, AXIS2_FAILURE);
 
     while (axiom_children_qname_iterator_has_next(module_refs, env))
@@ -386,6 +388,8 @@
             }
         }
     }
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, 
+        "Exit:axis2_conf_builder_process_module_refs");
     return status;
 }
 
@@ -404,6 +408,8 @@
     axis2_bool_t qname_itr_has_next = AXIS2_FALSE;
     axis2_status_t status = AXIS2_FAILURE;
 
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, 
+        "Entry:axis2_conf_builder_process_disp_order");
     AXIS2_PARAM_CHECK(env->error, disp_order_node, AXIS2_FAILURE);
 
     disp_order_element = axiom_node_get_data_element(disp_order_node, env);
@@ -422,7 +428,7 @@
     {
         qname_itr_has_next = axiom_children_qname_iterator_has_next(disps, env);
     }
-    while (AXIS2_TRUE == qname_itr_has_next)
+    while (qname_itr_has_next)
     {
         axiom_node_t *disp_node = NULL;
         axiom_element_t *disp_element = NULL;
@@ -459,7 +465,8 @@
         if (!impl_info_param)
         {
             AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-                "Parameter creation failed. Unable to continue");
+                "Parameter creation failed for %s. Unable to continue", 
+                    class_name);
             axis2_phase_free(disp_phase, env);
             return AXIS2_FAILURE;
         }
@@ -480,7 +487,7 @@
 
     }
 
-    if (AXIS2_TRUE != found_disp)
+    if (!found_disp)
     {
         axis2_phase_free(disp_phase, env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_DISPATCHER_FOUND,
@@ -493,7 +500,7 @@
     {
         status =
             axis2_conf_set_dispatch_phase(conf_builder->conf, env, disp_phase);
-        if (AXIS2_SUCCESS != status)
+        if (!status)
         {
             AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
                 "Setting dispatch phase failed. Unable to continue");
@@ -501,6 +508,8 @@
             return status;
         }
     }
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, 
+        "Exit:axis2_conf_builder_process_disp_order");
     return AXIS2_SUCCESS;
 }
 
@@ -516,6 +525,8 @@
 {
     axis2_phases_info_t *info = NULL;
 
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, 
+        "Entry:axis2_conf_builder_process_phase_orders");
     AXIS2_PARAM_CHECK(env->error, phase_orders, AXIS2_FAILURE);
 
     info =
@@ -565,25 +576,27 @@
             }
             return AXIS2_SUCCESS;
         }
-        if (flow_type && 0 == axutil_strcmp(AXIS2_IN_FLOW_START, flow_type))
+        if (flow_type && !axutil_strcmp(AXIS2_IN_FLOW_START, flow_type))
         {
             axis2_phases_info_set_in_phases(info, env, phase_list);
         }
-        else if (flow_type && 0 == axutil_strcmp(AXIS2_IN_FAILTFLOW, flow_type))
+        else if (flow_type && !axutil_strcmp(AXIS2_IN_FAILTFLOW, flow_type))
         {
             axis2_phases_info_set_in_faultphases(info, env, phase_list);
         }
         else if (flow_type &&
-                 0 == axutil_strcmp(AXIS2_OUT_FLOW_START, flow_type))
+                 !axutil_strcmp(AXIS2_OUT_FLOW_START, flow_type))
         {
             axis2_phases_info_set_out_phases(info, env, phase_list);
         }
         else if (flow_type &&
-                 0 == axutil_strcmp(AXIS2_OUT_FAILTFLOW, flow_type))
+                 !axutil_strcmp(AXIS2_OUT_FAILTFLOW, flow_type))
         {
             axis2_phases_info_set_out_faultphases(info, env, phase_list);
         }
     }
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, 
+        "Exit:axis2_conf_builder_process_phase_orders");
     return AXIS2_SUCCESS;
 }
 
@@ -598,6 +611,8 @@
     axutil_qname_t *qphase = NULL;
     axiom_element_t *phase_orders_element;
 
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, 
+        "Entry:axis2_conf_builder_get_phase_list");
     AXIS2_PARAM_CHECK(env->error, phase_orders_node, NULL);
 
     phase_orders_element = axiom_node_get_data_element(phase_orders_node, env);
@@ -658,6 +673,8 @@
 
         axutil_qname_free(qattname, env);
     }
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, 
+        "Exit:axis2_conf_builder_get_phase_list");
     return phase_list;
 }
 
@@ -668,7 +685,8 @@
     axiom_children_qname_iterator_t * trs_senders)
 {
     axis2_status_t status = AXIS2_FAILURE;
-
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, 
+        "Entry:axis2_conf_builder_process_transport_senders");
     while (axiom_children_qname_iterator_has_next(trs_senders, env))
     {
         axis2_transport_out_desc_t *transport_out = NULL;
@@ -753,23 +771,23 @@
 
             if (name)
             {
-                if (axutil_strcmp(name, AXIS2_TRANSPORT_HTTP) == 0)
+                if (!axutil_strcmp(name, AXIS2_TRANSPORT_HTTP))
                 {
                     transport_enum = AXIS2_TRANSPORT_ENUM_HTTP;
                 }
-                else if (axutil_strcmp(name, AXIS2_TRANSPORT_SMTP) == 0)
+                else if (!axutil_strcmp(name, AXIS2_TRANSPORT_SMTP))
                 {
                     transport_enum = AXIS2_TRANSPORT_ENUM_SMTP;
                 }
-                else if (axutil_strcmp(name, AXIS2_TRANSPORT_XMPP) == 0)
+                else if (!axutil_strcmp(name, AXIS2_TRANSPORT_XMPP))
                 {
                     transport_enum = AXIS2_TRANSPORT_ENUM_XMPP;
                 }
-                else if (axutil_strcmp(name, AXIS2_TRANSPORT_TCP) == 0)
+                else if (!axutil_strcmp(name, AXIS2_TRANSPORT_TCP))
                 {
                     transport_enum = AXIS2_TRANSPORT_ENUM_TCP;
                 }
-                else if (axutil_strcmp(name, AXIS2_TRANSPORT_HTTPS) == 0)
+                else if (!axutil_strcmp(name, AXIS2_TRANSPORT_HTTPS))
                 {
                     transport_enum = AXIS2_TRANSPORT_ENUM_HTTPS;
                 }
@@ -811,8 +829,8 @@
             if (!impl_info_param)
             {
                 AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI, 
-                    "Creating module dll name parameter failed. Unable "\
-                    "to continue");
+                    "Creating module dll name parameter failed for %s. Unable "\
+                    "to continue", class_name);
                 axis2_transport_out_desc_free(transport_out, env);
                 return AXIS2_FAILURE;
             }
@@ -820,7 +838,7 @@
             dll_name =
                 axutil_dll_desc_create_platform_specific_dll_name(dll_desc, env,
                                                                   class_name);
-            if (axis2_flag == AXIS2_FALSE)
+            if (!axis2_flag)
             {
                 repos_name =
                     axis2_dep_engine_get_repos_path
@@ -836,7 +854,7 @@
             }
             else
             {
-                libparam = axis2_conf_get_param (conf, env, "libDir");
+                libparam = axis2_conf_get_param (conf, env, AXIS2_LIB_DIR);
                 if (libparam)
                 {
                     libdir = axutil_param_get_value (libparam, env);
@@ -846,7 +864,7 @@
                 {
                     AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI, "Specifying" \
                         "services and modules directories using axis2.xml but"\
-                        " path of the library directory is not presant");
+                        " path of the library directory is not present");
                     return AXIS2_FAILURE;
                 }
                 path_qualified_dll_name = axutil_strcat (env, libdir, 
@@ -971,8 +989,8 @@
                                 AXIS2_ERROR_IN_FLOW_NOT_ALLOWED_IN_TRS_OUT,
                                 AXIS2_FAILURE);
                 AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI, 
-                    "A soap fault has occured in the in flow. Unable to "\
-                    "continue");
+                    "A soap fault has occured in the in flow while "\
+                    "processing transport senders. Unable to continue");
                 return AXIS2_FAILURE;
             }
 
@@ -1021,7 +1039,8 @@
             }
         }
     }
-
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, 
+        "Exit:axis2_conf_builder_process_transport_senders");
     return AXIS2_SUCCESS;
 }
 
@@ -1035,6 +1054,8 @@
     axis2_conf_t *conf;
     axis2_bool_t axis2_flag = AXIS2_FALSE;
 
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, 
+        "Entry:axis2_conf_builder_process_transport_recvs");
     AXIS2_PARAM_CHECK(env->error, trs_recvs, AXIS2_FAILURE);
 
     conf = conf_builder->conf;
@@ -1102,19 +1123,19 @@
             name = axiom_attribute_get_value(trs_name, env);
             if (name)
             {
-                if (axutil_strcmp(name, AXIS2_TRANSPORT_HTTP) == 0)
+                if (!axutil_strcmp(name, AXIS2_TRANSPORT_HTTP))
                 {
                     transport_enum = AXIS2_TRANSPORT_ENUM_HTTP;
                 }
-                else if (axutil_strcmp(name, AXIS2_TRANSPORT_SMTP) == 0)
+                else if (!axutil_strcmp(name, AXIS2_TRANSPORT_SMTP))
                 {
                     transport_enum = AXIS2_TRANSPORT_ENUM_SMTP;
                 }
-                else if (axutil_strcmp(name, AXIS2_TRANSPORT_TCP) == 0)
+                else if (!axutil_strcmp(name, AXIS2_TRANSPORT_TCP))
                 {
                     transport_enum = AXIS2_TRANSPORT_ENUM_TCP;
                 }
-                else if (axutil_strcmp(name, AXIS2_TRANSPORT_HTTPS) == 0)
+                else if (!axutil_strcmp(name, AXIS2_TRANSPORT_HTTPS))
                 {
                     transport_enum = AXIS2_TRANSPORT_ENUM_HTTPS;
                 }
@@ -1185,7 +1206,7 @@
                 else
                 {
                     /* Axis2 Configuration is built using axis2.xml */
-                    tnsparam = axis2_conf_get_param (conf, env, "libDir");
+                    tnsparam = axis2_conf_get_param (conf, env, AXIS2_LIB_DIR);
                     if (tnsparam)
                     {
                         libpath = (axis2_char_t *)axutil_param_get_value (tnsparam, env);
@@ -1256,7 +1277,8 @@
             if (!status)
             {
                 AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-                    "Processing parameters failed. Unable to continue");
+                    "Processing transport receiver parameters failed. "\
+                        "Unable to continue");
                 axis2_transport_in_desc_free(transport_in, env);
                 return status;
             }
@@ -1374,6 +1396,8 @@
 
         }
     }
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, 
+        "Exit:axis2_conf_builder_process_transport_recvs");
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/src/core/engine/phase.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/engine/phase.c?rev=638437&r1=638436&r2=638437&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/engine/phase.c (original)
+++ webservices/axis2/trunk/c/src/core/engine/phase.c Tue Mar 18 09:46:53 2008
@@ -162,7 +162,8 @@
     int index = 0,
         size = 0;
     axis2_status_t status = AXIS2_SUCCESS;
-
+    
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "Entry:axis2_phase_invoke");
     axis2_msg_ctx_set_paused_phase_name(msg_ctx, env, phase->name);
     if (phase->first_handler)
     {
@@ -184,7 +185,8 @@
             if (!status)
             {
                 AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-                    "Handler %s invoke failed", handler_name);
+                    "Handler %s invoke failed within phase %s", handler_name, 
+                        phase->name);
                 return status;
             }
         }
@@ -212,7 +214,8 @@
                 if (!status)
                 {
                     AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-                        "Handler %s invoke failed", handler_name);
+                        "Handler %s invoke failed within phase %s", 
+                            handler_name, phase->name);
                     return status;
                 }
                 /* index increment should be done after the invoke function. If the invocation
@@ -243,12 +246,13 @@
             if (!status)
             {
                 AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-                    "Handler %s invoke failed", handler_name);
+                    "Handler %s invoke failed within  phase %s", handler_name, 
+                        phase->name);
                 return status;
             }
         }
     }
-
+    AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "Exit:axis2_phase_invoke");
     return AXIS2_SUCCESS;
 }
 
@@ -277,6 +281,8 @@
         *after = NULL;
     axis2_handler_desc_t *handler_desc = NULL;
     axis2_phase_rule_t *rules = NULL;
+    const axis2_char_t *name = 
+        axutil_string_get_buffer(axis2_handler_get_name(handler, env), env);
 
     handler_desc = axis2_handler_get_handler_desc(handler, env);
     if (!handler_desc)
@@ -284,7 +290,7 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
                         AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-            "Handler description is not set for the Handler");
+            "Handler description is not set for the Handler %s", name);
         return AXIS2_FAILURE;
     }
 
@@ -294,7 +300,7 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
                         AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-            "Handler rules are not set for the Handler Description");
+            "Handler rules are not set for the Handler Description %s", name);
         return AXIS2_FAILURE;
     }
 
@@ -333,12 +339,16 @@
     const axutil_env_t * env,
     axis2_handler_t * handler)
 {
+    const axis2_char_t *handler_name = 
+        axutil_string_get_buffer(axis2_handler_get_name(handler, env), env);
+    const axis2_char_t *phase_name = axis2_phase_get_name(phase, env);
     if (phase->first_handler_set)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_PHASE_FIRST_HANDLER_ALREADY_SET,
                         AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-            "First handler of phase already set");
+            "First handler of phase already set, so cannot set handler %s "\
+            "in to the phase %s as first handler", handler_name, phase_name);
         return AXIS2_FAILURE;
     }
     else
@@ -348,7 +358,8 @@
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_PHASE_FIRST_HANDLER,
                             AXIS2_FAILURE);
             AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-                "Invalid first handler set for the Phase");
+                "Invalid first handler %s set for the Phase %s", handler_name, 
+                phase_name);
             return AXIS2_FAILURE;
         }
         phase->first_handler = handler;
@@ -364,12 +375,16 @@
     const axutil_env_t * env,
     axis2_handler_t * handler)
 {
+    const axis2_char_t *handler_name = 
+        axutil_string_get_buffer(axis2_handler_get_name(handler, env), env);
+    const axis2_char_t *phase_name = axis2_phase_get_name(phase, env);
     if (phase->last_handler_set)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_PHASE_LAST_HANDLER_ALREADY_SET,
                         AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-            "Last handler of phase already set");
+            "Last handler of phase already set, so cannot set handler %s "\
+            "in to the phase %s as last handler", handler_name, phase_name);
         return AXIS2_FAILURE;
     }
     else
@@ -379,7 +394,8 @@
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_PHASE_LAST_HANDLER,
                             AXIS2_FAILURE);
             AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-                "Invalid last handler set for the phase");
+                "Invalid last handler %s set for the Phase %s", handler_name, 
+                phase_name);
             return AXIS2_FAILURE;
         }
         phase->last_handler = handler;
@@ -400,13 +416,16 @@
     axis2_status_t status = AXIS2_SUCCESS;
     axis2_bool_t first = AXIS2_FALSE,
         last = AXIS2_FALSE;
-
+    const axis2_char_t *handler_desc_name = 
+        axutil_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), 
+            env);
     if (phase->is_one_handler)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_PHASE_ADD_HANDLER_INVALID,
                         AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-            "Only one handler allowed for phase, adding handler is not allowed");
+            "Only one handler allowed for phase %s, adding handler %s is not "\
+            "allowed", phase->name, handler_desc_name);
         return AXIS2_FAILURE;
     }
     else
@@ -417,7 +436,8 @@
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
                             AXIS2_FAILURE);
             AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-                "Handler rules are not set for the Hanlder Description");
+                "Handler rules are not set for the Hanlder Description %s "\
+                    "within phase %s", handler_desc_name, phase->name);
             return AXIS2_FAILURE;
         }
 
@@ -431,7 +451,8 @@
                 AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_RULES,
                                 AXIS2_FAILURE);
                 AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-                    "Invalid handler rules");
+                    "Invalid handler rules, so unable to add handler %s to "\
+                        "phase %s", handler_desc_name, phase->name);
                 return AXIS2_FAILURE;
             }
 
@@ -441,13 +462,14 @@
                 AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
                                 AXIS2_FAILURE);
                 AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-                    "Handler is not set for the Handler Description");
+                    "Handler is not set for the Handler Description %s "\
+                        "within phase %s", handler_desc_name, phase->name);
                 return AXIS2_FAILURE;
             }
 
             /*status = axutil_array_list_add(phase->handlers, env, handler); */
             status = axis2_phase_add_unique(env, phase->handlers, handler);
-            if (status == AXIS2_SUCCESS)
+            if (status)
                 phase->is_one_handler = AXIS2_TRUE;
             return status;
         }
@@ -459,7 +481,8 @@
                 AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
                                 AXIS2_FAILURE);
                 AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-                    "Handler is not set for the Handler Description");
+                    "Handler is not set for the Handler Description %s "\
+                        "within phase %s", handler_desc_name, phase->name);
                 return AXIS2_FAILURE;
             }
             return axis2_phase_set_first_handler(phase, env, handler);
@@ -472,7 +495,8 @@
                 AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
                                 AXIS2_FAILURE);
                 AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-                    "Handler is not set for the Handler Description");
+                    "Handler is not set for the Handler Description %s "\
+                        "within phase %s", handler_desc_name, phase->name);
                 return AXIS2_FAILURE;
             }
             return axis2_phase_set_last_handler(phase, env, handler);
@@ -485,7 +509,8 @@
                 AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
                                 AXIS2_FAILURE);
                 AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-                    "Handler is not set for the Handler Description");
+                    "Handler is not set for the Handler Description %s "\
+                        "within phase %s", handler_desc_name, phase->name);
                 return AXIS2_FAILURE;
             }
 
@@ -597,6 +622,9 @@
         *before = NULL;
     int i = 0;
     int size = 0;
+    const axis2_char_t *name = 
+        axutil_string_get_buffer(axis2_handler_get_name(handler, env), env);
+    const axis2_char_t *handler_desc_name = NULL;
 
     handler_desc = axis2_handler_get_handler_desc(handler, env);
     if (!handler_desc)
@@ -604,9 +632,12 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
                         AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-            "Handler description is not set in the handler");
+            "Handler description is not set in the handler %s within phase %s", 
+                name, phase->name);
         return AXIS2_FAILURE;
     }
+    handler_desc_name = axutil_string_get_buffer(axis2_handler_desc_get_name(
+        handler_desc, env), env);
 
     rules = axis2_handler_desc_get_rules(handler_desc, env);
     if (!rules)
@@ -614,7 +645,8 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
                         AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-            "Handler rules are not set in the handler description");
+            "Handler rules are not set in the handler description %s within "\
+                "phase %s", handler_desc_name, phase->name);
         return AXIS2_FAILURE;
     }
 
@@ -624,19 +656,24 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
                         AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-            "Rule `before` is not set in the handler rules");
+            "Rule `before` is not set in the handler rules for handler %s "\
+                "within phase %s", name, phase->name);
         return AXIS2_FAILURE;
     }
 
     if (phase->last_handler)
     {
+        const axis2_char_t *last_handler_name = 
+            axutil_string_get_buffer(axis2_handler_get_name(phase->last_handler, 
+                env), env);
         handler_desc = axis2_handler_get_handler_desc(phase->last_handler, env);
         if (!handler_desc)
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
                             AXIS2_FAILURE);
             AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-                "Handler description is not set in the last handler");
+                "Handler description is not set in the last handler %s of "\
+                    "phase %s", last_handler_name, phase->name);
             return AXIS2_FAILURE;
         }
 
@@ -648,7 +685,9 @@
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
                             AXIS2_FAILURE);
             AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-                "Handler name is not set in the handler description");
+                "Handler name is not set in the handler description for "\
+                    "last handler %s within phase %s", last_handler_name, 
+                        phase->name);
             return AXIS2_FAILURE;
         }
 
@@ -667,13 +706,17 @@
             (axis2_handler_t *) axutil_array_list_get(phase->handlers, env, i);
         if (temp_handler)
         {
+            const axis2_char_t *temp_handler_name = 
+                axutil_string_get_buffer(axis2_handler_get_name(temp_handler, 
+                    env), env);
             handler_desc = axis2_handler_get_handler_desc(temp_handler, env);
             if (!handler_desc)
             {
                 AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
                                 AXIS2_FAILURE);
                 AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-                    "Handler Description is not set for the Handler");
+                    "Handler Description is not set for the Handler %s "\
+                        "within phase %s", temp_handler_name, phase->name);
                 return AXIS2_FAILURE;
             }
 
@@ -685,7 +728,9 @@
                 AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
                                 AXIS2_FAILURE);
                 AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-                    "Handler name is not set in the handler description");
+                    "Handler name is not set in the handler description for "\
+                        "handler %s within phase %s", temp_handler_name, 
+                            phase->name);
                 return AXIS2_FAILURE;
             }
 
@@ -713,6 +758,9 @@
     const axis2_char_t *after = NULL;
     int i = 0;
     int size = 0;
+    const axis2_char_t *name = axutil_string_get_buffer(
+        axis2_handler_get_name(handler, env), env);
+    const axis2_char_t *handler_desc_name = NULL;
 
     handler_desc = axis2_handler_get_handler_desc(handler, env);
     if (!handler_desc)
@@ -720,17 +768,20 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
                         AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-            "Handler description is not set in the handler");
+            "Handler description is not set in the handler %s within phase %s",
+                name, phase->name);
         return AXIS2_FAILURE;
     }
-
+    handler_desc_name = axutil_string_get_buffer(
+        axis2_handler_desc_get_name(handler_desc, env), env);
     rules = axis2_handler_desc_get_rules(handler_desc, env);
     if (!rules)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
                         AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-            "Handler rules are not set in the handler description");
+            "Handler rules are not set in the handler description %s within "\
+                "phase %s", handler_desc_name, phase->name);
         return AXIS2_FAILURE;
     }
 
@@ -740,12 +791,15 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
                         AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-            "Rule `after` is not set in the handler rules");
+            "Rule `after` is not set in the handler rules for handler desc "\
+                "%s within phase %s", handler_desc_name, phase->name);
         return AXIS2_FAILURE;
     }
 
     if (phase->first_handler)
     {
+        const axis2_char_t *first_handler_name = axutil_string_get_buffer(
+            axis2_handler_get_name(phase->first_handler, env), env);
         handler_desc =
             axis2_handler_get_handler_desc(phase->first_handler, env);
         if (!handler_desc)
@@ -753,7 +807,8 @@
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
                             AXIS2_FAILURE);
             AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-                "Handler description is not set in the first handler");
+                "Handler description is not set in the first handler %s "\
+                    "within phase %s", first_handler_name, phase->name);
             return AXIS2_FAILURE;
         }
 
@@ -765,7 +820,8 @@
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
                             AXIS2_FAILURE);
             AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-                "Handler name is not set in the handler description");
+                "Handler name is not set in the handler description for "\
+                    "handler %s within phase %s", name, phase->name);
             return AXIS2_FAILURE;
         }
 
@@ -783,13 +839,16 @@
             (axis2_handler_t *) axutil_array_list_get(phase->handlers, env, i);
         if (temp_handler)
         {
+            const axis2_char_t *temp_handler_name = axutil_string_get_buffer(
+                axis2_handler_get_name(temp_handler, env), env);
             handler_desc = axis2_handler_get_handler_desc(temp_handler, env);
             if (!handler_desc)
             {
                 AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
                                 AXIS2_FAILURE);
                 AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-                    "Handler description is not set in the handler");
+                    "Handler description is not set in the handler %s within"\
+                        " phase %s", temp_handler_name, phase->name);
                 return AXIS2_FAILURE;
             }
 
@@ -801,7 +860,8 @@
                 AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
                                 AXIS2_FAILURE);
                 AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-                    "Handler name is not set in the handler description");
+                    "Handler name is not set in the handler description %s "\
+                        "within phase %s", temp_handler_name, phase->name);
                 return AXIS2_FAILURE;
             }
 
@@ -844,6 +904,9 @@
         *handler_name = NULL;
     int i = 0;
     int size = 0;
+    const axis2_char_t *name = axutil_string_get_buffer(
+        axis2_handler_get_name(handler, env), env);
+    const axis2_char_t *handler_desc_name = NULL;
 
     handler_desc = axis2_handler_get_handler_desc(handler, env);
     if (!handler_desc)
@@ -851,9 +914,12 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
                         AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-            "Handler description is not set in the handler");
+            "Handler description is not set in the handler %s within phase %s", 
+                name, phase->name);
         return AXIS2_FAILURE;
     }
+    handler_desc_name = axutil_string_get_buffer(
+        axis2_handler_desc_get_name(handler_desc, env), env);
 
     rules = axis2_handler_desc_get_rules(handler_desc, env);
     if (!rules)
@@ -861,7 +927,8 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
                         AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-            "Handler rules are not set in the handler description");
+            "Handler rules are not set in the handler description %s within "\
+                "phase %s", handler_desc_name, phase->name);
         return AXIS2_FAILURE;
     }
 
@@ -871,7 +938,8 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
                         AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-            "Rule `before` is not set in the handler rules");
+            "Rule `before` is not set in the handler rules for handler desc "\
+            "   %s within phase %s", handler_desc_name, phase->name);
         return AXIS2_FAILURE;
     }
 
@@ -881,12 +949,15 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
                         AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-            "Rule `after` is not set in the handler rules");
+            "Rule `after` is not set in the handler rules for handler desc "\
+                "%s within phase %s", handler_desc_name, phase->name);
         return AXIS2_FAILURE;
     }
 
     if (phase->first_handler)
     {
+        const axis2_char_t *first_handler_name = axutil_string_get_buffer(
+            axis2_handler_get_name(phase->first_handler, env), env);
         handler_desc =
             axis2_handler_get_handler_desc(phase->first_handler, env);
         if (!handler_desc)
@@ -894,44 +965,52 @@
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
                             AXIS2_FAILURE);
             AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-                "Handler description is not set in the first handler");
+                "Handler description is not set in the first handler %s "\
+                    "within phase %s", first_handler_name, phase->name);
             return AXIS2_FAILURE;
         }
 
         before_handler_name =
             axutil_string_get_buffer(axis2_handler_desc_get_name
                                      (handler_desc, env), env);
-        if (!handler_name)
+        if (!before_handler_name)
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
                             AXIS2_FAILURE);
             AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-                "Handler name is not set in the handler description");
+                "Handler name is not set in the handler description for the "\
+                    "first handler %s within phase %s", first_handler_name, 
+                        phase->name);
             return AXIS2_FAILURE;
         }
     }
 
     if (phase->last_handler)
     {
+        const axis2_char_t *last_handler_name = axutil_string_get_buffer(
+            axis2_handler_get_name(phase->last_handler, env), env);
         handler_desc = axis2_handler_get_handler_desc(phase->last_handler, env);
         if (!handler_desc)
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
                             AXIS2_FAILURE);
             AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-                "Handler description is not set in the last handler");
+                "Handler description is not set in the last handler %s "\
+                    "within phase %s", last_handler_name, phase->name);
             return AXIS2_FAILURE;
         }
 
         after_handler_name =
             axutil_string_get_buffer(axis2_handler_desc_get_name
                                      (handler_desc, env), env);
-        if (!handler_name)
+        if (!after_handler_name)
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
                             AXIS2_FAILURE);
             AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-                "Handler name is not set in the handler description");
+                "Handler name is not set in the handler description for the "\
+                    "last handler %s within phase %s", last_handler_name, 
+                        phase->name);
             return AXIS2_FAILURE;
         }
     }
@@ -965,13 +1044,16 @@
             (axis2_handler_t *) axutil_array_list_get(phase->handlers, env, i);
         if (temp_handler)
         {
+            const axis2_char_t *temp_handler_name = axutil_string_get_buffer(
+                axis2_handler_get_name(temp_handler, env), env);
             handler_desc = axis2_handler_get_handler_desc(temp_handler, env);
             if (!handler_desc)
             {
                 AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
                                 AXIS2_FAILURE);
                 AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-                    "Handler Description is not set for the Handler");
+                    "Handler Description is not set for the Handler %s "\
+                        "within phase %s", temp_handler_name, phase->name);
                 return AXIS2_FAILURE;
             }
 
@@ -983,7 +1065,9 @@
                 AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
                                 AXIS2_FAILURE);
                 AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-                    "Handler name is not set in the handler Description");
+                    "Handler name is not set in the handler Description for "\
+                        "handler %s within phase %s", temp_handler_name, 
+                            phase->name);
                 return AXIS2_FAILURE;
             }
 
@@ -1002,7 +1086,8 @@
                                 AXIS2_FAILURE);
                 AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
                     "Both the before and after indexes have been found and "\
-                    "`after` comes before `before` which is wrong");
+                    "`after` comes before `before` which is wrong within "\
+                    "phase %s", phase->name);
                 return AXIS2_FAILURE;
             }
             else
@@ -1032,7 +1117,9 @@
     int type = 0;
     axis2_handler_t *handler = NULL;
     axis2_status_t status = AXIS2_FAILURE;
-
+    const axis2_char_t *handler_desc_name = axutil_string_get_buffer(
+        axis2_handler_desc_get_name(handler_desc, env), env);
+    const axis2_char_t *handler_name = NULL;
     handler = axis2_handler_desc_get_handler(handler_desc, env);
 
     if (!handler)
@@ -1040,16 +1127,20 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
                         AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-            "Handler description is not set in the handler");
+            "Handler is not set in the handler description %s", 
+            handler_desc_name);
         return AXIS2_FAILURE;
     }
+    handler_name = axutil_string_get_buffer(
+        axis2_handler_get_name(handler, env), env);
 
     if (!_axis2_phase_is_valid_after(phase, env, handler))
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
                         AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-            "Invalid Handler State");
+            "Invalid Handler State for the handler %s within the phase %s", 
+                handler_name, phase->name);
         return AXIS2_FAILURE;
     }
 
@@ -1058,7 +1149,8 @@
         AXIS2_ERROR_SET(env->error,
                         AXIS2_ERROR_INVALID_HANDLER_STATE, AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-            "Invalid Handler State");
+            "Invalid Handler State for the handler %s within the phase %s", 
+                handler_name, phase->name);
         return AXIS2_FAILURE;
     }
 
@@ -1079,6 +1171,9 @@
         status = axis2_phase_add_unique(env, phase->handlers, handler);
         break;
     default:
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
+            "Handler description %s insertion failed within the phase %s", 
+                handler_desc_name, phase->name);
         status = AXIS2_FAILURE;
         break;
     }
@@ -1113,6 +1208,8 @@
             (axis2_handler_t *) axutil_array_list_get(phase->handlers, env, i);
         if (handler)
         {
+            const axis2_char_t *handler_name = axutil_string_get_buffer(
+                axis2_handler_get_name(handler, env), env);
             int index = -1;
 
             axis2_handler_desc_t *handler_desc =
@@ -1122,7 +1219,8 @@
                 AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
                                 AXIS2_FAILURE);
                 AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-                    "Invalid Handler State");
+                    "Invalid Handler State for the handler %s within phase %s", 
+                        handler_name, phase->name);
                 return AXIS2_FAILURE;
             }
 
@@ -1164,13 +1262,16 @@
     axis2_handler_desc_t * handler_desc)
 {
     axis2_handler_t *handler;
+    const axis2_char_t *handler_desc_name = axutil_string_get_buffer(
+        axis2_handler_desc_get_name(handler_desc, env), env);
     handler = axis2_handler_desc_get_handler(handler_desc, env);
     if (!handler)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
                         AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-            "Handler is not set in the Handler Description");
+            "Handler is not set in the Handler Description %s within phase %s", 
+                handler_desc_name, phase->name);
         return AXIS2_FAILURE;
     }
     return axis2_phase_remove_unique(env, phase->handlers, handler);
@@ -1201,7 +1302,7 @@
             add_handler = AXIS2_FALSE;
             break;
         }
-        else if (0 == axutil_strcmp(axutil_string_get_buffer(handler_name, env),
+        else if (!axutil_strcmp(axutil_string_get_buffer(handler_name, env),
                                     axutil_string_get_buffer(obj_name, env)))
         {
             add_handler = AXIS2_FALSE;



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message