fixing comments
diff --git a/src/handlers/rampart_in_handler.c b/src/handlers/rampart_in_handler.c
index 4b75ebf..631cade 100644
--- a/src/handlers/rampart_in_handler.c
+++ b/src/handlers/rampart_in_handler.c
@@ -57,7 +57,6 @@
{
axiom_soap_envelope_t *soap_envelope = NULL;
axiom_soap_header_t *soap_header = NULL;
- axis2_status_t status = AXIS2_FAILURE;
axiom_node_t *sec_node = NULL;
rampart_context_t *rampart_context = NULL;
diff --git a/src/handlers/rampart_out_handler.c b/src/handlers/rampart_out_handler.c
index 8415156..8100ad7 100644
--- a/src/handlers/rampart_out_handler.c
+++ b/src/handlers/rampart_out_handler.c
@@ -31,7 +31,7 @@
#include <rampart_context.h>
#include <rampart_engine.h>
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axis2_status_t AXIS2_CALL
rampart_out_handler_invoke(
struct axis2_handler *handler,
const axutil_env_t * env,
@@ -45,14 +45,13 @@
*/
AXIS2_EXTERN axis2_handler_t *AXIS2_CALL
rampart_out_handler_create(
- const axutil_env_t *env,
+ const axutil_env_t *env,
axutil_string_t *name)
{
axis2_handler_t *handler = NULL;
- AXIS2_ENV_CHECK(env, NULL);
handler = axis2_handler_create(env);
- if (!handler)
+ if(!handler)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart]Cannot create out-handler.");
return NULL;
@@ -60,7 +59,7 @@
/* Set the base struct's invoke op */
axis2_handler_set_invoke(handler, env, rampart_out_handler_invoke);
-
+
return handler;
}
@@ -73,7 +72,7 @@
axis2_status_t AXIS2_CALL
rampart_out_handler_invoke(
struct axis2_handler * handler,
- const axutil_env_t * env,
+ const axutil_env_t * env,
axis2_msg_ctx_t * msg_ctx)
{
axiom_soap_envelope_t *soap_envelope = NULL;
@@ -83,67 +82,64 @@
axis2_status_t status = AXIS2_FAILURE;
rampart_context_t *rampart_context = NULL;
- AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
+ if(!msg_ctx)
+ {
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart]message context is invalid");
+ return AXIS2_FAILURE;
+ }
/*
* Since rampart out_handler is a global handler we should
* first check whether the rampart module is engaged.If not we
* should not process the message and return success.
*/
- if(!rampart_is_rampart_engaged(env,msg_ctx))
+ if(!rampart_is_rampart_engaged(env, msg_ctx))
{
- AXIS2_LOG_INFO(env->log,
- "[rampart] Rampart is not engaged. No security support is needed.");
+ AXIS2_LOG_INFO(env->log, "[rampart]Rampart is not engaged. No security support is needed.");
return AXIS2_SUCCESS;
}
- soap_envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
- if (!soap_envelope)
+ soap_envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
+ if(!soap_envelope)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[rampart][rampart_out_handler] SOAP envelope cannot be found.");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart]SOAP envelope cannot be found.");
return AXIS2_FAILURE;
}
- soap_header = axiom_soap_envelope_get_header(soap_envelope, env);
- if (!soap_header)
+ soap_header = axiom_soap_envelope_get_header(soap_envelope, env);
+ if(!soap_header)
{
/*No SOAP header, so no point of proceeding. FAIL*/
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[rampart][rampart_out_handler] SOAP header cannot be found.");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart]SOAP header cannot be found.");
return AXIS2_FAILURE;
}
soap_header_node = axiom_soap_header_get_base_node(soap_header, env);
if(!soap_header_node)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[rampart][rampart_out_handler] Cannot get soap header node.");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart]Cannot get soap header node.");
return AXIS2_FAILURE;
}
- soap_header_ele = (axiom_element_t *)axiom_node_get_data_element(soap_header_node,env);
+ soap_header_ele = (axiom_element_t *)axiom_node_get_data_element(soap_header_node, env);
if(!soap_header_ele)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[rampart][rampart_out_handler] Cannot get soap header element.");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart]Cannot get soap header element.");
return AXIS2_FAILURE;
}
rampart_context = rampart_engine_build_configuration(env, msg_ctx, AXIS2_FALSE);
if(!rampart_context)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[rampart][rampart_out_handler] ramaprt_context creation failed.");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart]ramaprt_context creation failed.");
return AXIS2_FAILURE;
}
- status = rampart_shb_build_message(env, msg_ctx, rampart_context, soap_envelope);
- if(status != AXIS2_SUCCESS)
+ if(rampart_shb_build_message(env, msg_ctx, rampart_context, soap_envelope) != AXIS2_SUCCESS)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[rampart][rampart_out_handler] Security header building failed.");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart]Security header building failed.");
+ return AXIS2_FAILURE;
}
- return status;
+ return AXIS2_SUCCESS;
}
