Author: damitha
Date: Tue Dec 11 08:38:30 2007
New Revision: 603292
URL: http://svn.apache.org/viewvc?rev=603292&view=rev
Log:
cleaning the code
Modified:
webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
webservices/sandesha/trunk/c/src/polling/polling_mgr.c
webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
webservices/sandesha/trunk/c/src/workers/sender_worker.c
Modified: webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c?rev=603292&r1=603291&r2=603292&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c (original)
+++ webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c Tue Dec 11
08:38:30 2007
@@ -41,7 +41,6 @@
axis2_msg_ctx_t *msg_ctx)
{
sandesha2_msg_ctx_t *rm_msg_ctx = NULL;
- AXIS2_ENV_CHECK(env, NULL);
rm_msg_ctx = (sandesha2_msg_ctx_t *)AXIS2_MALLOC
(env->allocator, sizeof(sandesha2_msg_ctx_t));
@@ -70,8 +69,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
if(rm_msg_ctx->addr_ns_val)
{
AXIS2_FREE(env->allocator, rm_msg_ctx->addr_ns_val);
@@ -102,7 +99,6 @@
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
rm_msg_ctx->msg_ctx = msg_ctx;
@@ -114,7 +110,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return rm_msg_ctx->msg_ctx;
}
@@ -127,8 +122,6 @@
axutil_hash_index_t *hi = NULL;
axiom_soap_envelope_t *soap_envelope = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
if(AXIS2_FALSE == axis2_msg_ctx_get_is_soap_11(rm_msg_ctx->msg_ctx, env))
soap_ver = AXIOM_SOAP12;
soap_envelope = axis2_msg_ctx_get_soap_envelope(rm_msg_ctx->msg_ctx, env);
@@ -158,7 +151,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, -1);
return rm_msg_ctx->msg_type;
}
@@ -167,8 +159,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env, int msg_type)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
rm_msg_ctx->msg_type = msg_type;
return AXIS2_SUCCESS;
}
@@ -180,7 +170,6 @@
sandesha2_iom_rm_part_t *part)
{
axis2_char_t *part_id_str = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, part, AXIS2_FAILURE);
part_id_str = AXIS2_MALLOC(env->allocator, 32 * sizeof(axis2_char_t));
@@ -197,7 +186,6 @@
int part_id)
{
axis2_char_t part_id_str[32];
- AXIS2_ENV_CHECK(env, NULL);
sprintf(part_id_str, "%d", part_id);
return axutil_hash_get(rm_msg_ctx->msg_parts, part_id_str,
@@ -209,8 +197,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return axis2_msg_ctx_get_from(rm_msg_ctx->msg_ctx, env);
}
@@ -220,7 +206,6 @@
const axutil_env_t *env,
axis2_endpoint_ref_t *from)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, from, AXIS2_FAILURE);
return axis2_msg_ctx_set_to(rm_msg_ctx->msg_ctx, env, from);;
@@ -231,8 +216,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return axis2_msg_ctx_get_to(rm_msg_ctx->msg_ctx, env);
}
@@ -242,7 +225,6 @@
const axutil_env_t *env,
axis2_endpoint_ref_t *to)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, to, AXIS2_FAILURE);
return axis2_msg_ctx_set_to(rm_msg_ctx->msg_ctx, env, to);
@@ -253,8 +235,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return axis2_msg_ctx_get_reply_to(rm_msg_ctx->msg_ctx, env);
}
@@ -263,7 +243,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env, axis2_endpoint_ref_t *reply_to)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, reply_to, AXIS2_FAILURE);
return axis2_msg_ctx_set_reply_to(rm_msg_ctx->msg_ctx, env, reply_to);
@@ -274,8 +253,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return axis2_msg_ctx_get_fault_to(rm_msg_ctx->msg_ctx, env);
}
@@ -284,7 +261,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env, axis2_endpoint_ref_t *fault_to)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, fault_to, AXIS2_FAILURE);
return axis2_msg_ctx_set_fault_to(rm_msg_ctx->msg_ctx, env, fault_to);
@@ -295,8 +271,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return axis2_msg_ctx_get_relates_to(rm_msg_ctx->msg_ctx, env);
}
@@ -305,7 +279,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env, axis2_relates_to_t *relates_to)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, relates_to, AXIS2_FAILURE);
return axis2_msg_ctx_set_relates_to(rm_msg_ctx->msg_ctx, env, relates_to);
@@ -316,8 +289,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return (axis2_char_t*)axis2_msg_ctx_get_wsa_message_id(
rm_msg_ctx->msg_ctx, env);
}
@@ -328,7 +299,6 @@
const axutil_env_t *env,
axis2_char_t *msg_id)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_id, AXIS2_FAILURE);
return axis2_msg_ctx_set_message_id(rm_msg_ctx->msg_ctx, env, msg_id);
@@ -339,8 +309,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return axis2_msg_ctx_get_soap_envelope(rm_msg_ctx->msg_ctx, env);
}
@@ -350,7 +318,6 @@
const axutil_env_t *env,
axiom_soap_envelope_t *soap_envelope)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, soap_envelope, AXIS2_FAILURE);
return axis2_msg_ctx_set_soap_envelope(rm_msg_ctx->msg_ctx, env,
@@ -362,8 +329,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return (axis2_char_t*)axis2_msg_ctx_get_wsa_action(rm_msg_ctx->msg_ctx,
env);
}
@@ -372,7 +337,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env, axis2_char_t *action)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, action, AXIS2_FAILURE);
return axis2_msg_ctx_set_wsa_action(rm_msg_ctx->msg_ctx, env, action);
@@ -383,7 +347,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env, axis2_char_t *key)
{
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, key, NULL);
return axis2_msg_ctx_get_property(rm_msg_ctx->msg_ctx, env, key);
@@ -396,7 +359,6 @@
axis2_char_t *key,
void *val)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, key, AXIS2_FAILURE);
return axis2_msg_ctx_set_property(rm_msg_ctx->msg_ctx, env, key, val);
@@ -408,7 +370,6 @@
const axutil_env_t *env,
axutil_string_t *soap_action)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, soap_action, AXIS2_FAILURE);
if(NULL == rm_msg_ctx->msg_ctx)
@@ -424,8 +385,6 @@
const axutil_env_t *env,
axis2_bool_t paused)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
if(NULL == rm_msg_ctx->msg_ctx)
return AXIS2_FAILURE;
return axis2_msg_ctx_set_paused(rm_msg_ctx->msg_ctx, env, paused);
@@ -436,7 +395,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return rm_msg_ctx->rm_ns_val;
}
@@ -446,7 +404,6 @@
const axutil_env_t *env,
axis2_char_t *ns_val)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, ns_val, AXIS2_FAILURE);
if(NULL != rm_msg_ctx->rm_ns_val)
@@ -468,7 +425,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return rm_msg_ctx->addr_ns_val;
}
@@ -477,7 +433,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env, axis2_char_t *ns_val)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, ns_val, AXIS2_FAILURE);
if(NULL != rm_msg_ctx->addr_ns_val)
@@ -494,8 +449,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, -1);
-
if(NULL == rm_msg_ctx->msg_ctx)
return -1;
return axis2_msg_ctx_get_flow(rm_msg_ctx->msg_ctx, env);
@@ -506,8 +459,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env, int flow)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
if(NULL == rm_msg_ctx->msg_ctx)
return AXIS2_FAILURE;
@@ -519,7 +470,6 @@
sandesha2_msg_ctx_t *rm_msg_ctx,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return rm_msg_ctx->spec_ver;
}
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c?rev=603292&r1=603291&r2=603292&view=diff
==============================================================================
---
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
(original)
+++
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
Tue Dec 11 08:38:30 2007
@@ -340,12 +340,23 @@
sandesha2_msg_ctx_t *create_seq_rm_msg = NULL;
axis2_msg_ctx_t *create_seq_msg = NULL;
axis2_char_t *acks_to = NULL;
+ axis2_endpoint_ref_t *from = NULL;
acks_to = (axis2_char_t *)
axis2_endpoint_ref_get_address(acks_to_epr, env);
create_seq_rm_msg =
sandesha2_msg_creator_create_create_seq_msg(env,
rm_msg_ctx, int_seq_id, acks_to, storage_mgr);
sandesha2_msg_ctx_set_flow(create_seq_rm_msg, env,
SANDESHA2_MSG_CTX_OUT_FLOW);
create_seq_msg = sandesha2_msg_ctx_get_msg_ctx(create_seq_rm_msg,
env);
+ from = sandesha2_msg_ctx_get_from(rm_msg_ctx, env);
+ if(from)
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2]from:%s",
+ axis2_endpoint_ref_get_address(from, env));
+ else
+ {
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]from not
set");
+ return AXIS2_FAILURE;
+ }
+ axis2_msg_ctx_set_to(create_seq_msg, env, from);
axis2_msg_ctx_set_relates_to(create_seq_msg, env, NULL);
new_msg_store_key = axutil_uuid_gen(env);
sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env,
new_msg_store_key,
Modified: webservices/sandesha/trunk/c/src/polling/polling_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/polling/polling_mgr.c?rev=603292&r1=603291&r2=603292&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/polling/polling_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/polling/polling_mgr.c Tue Dec 11 08:38:30
2007
@@ -379,6 +379,7 @@
sandesha2_sender_bean_set_resend(make_conn_sender_bean, env,
AXIS2_FALSE);
sandesha2_sender_bean_set_send(make_conn_sender_bean, env,
AXIS2_TRUE);
/*sandesha2_sender_bean_set_seq_id(make_conn_sender_bean, env,
seq_id);*/
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2]seq_id:%s",
seq_id);
sandesha2_sender_bean_set_internal_seq_id(make_conn_sender_bean,
env, seq_id);
to = sandesha2_msg_ctx_get_to(make_conn_rm_msg_ctx, env);
Modified:
webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c?rev=603292&r1=603291&r2=603292&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
(original)
+++ webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c Tue
Dec 11 08:38:30 2007
@@ -168,7 +168,11 @@
SANDESHA2_MESSAGE_STORE_KEY);
if(NULL == property || NULL == axutil_property_get_value(property, env))
+ {
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2]SANDESHA2_MESSAGE_STORE_KEY property is NULL");
return AXIS2_FAILURE;
+ }
key = axutil_property_get_value(property, env);
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
Modified: webservices/sandesha/trunk/c/src/workers/sender_worker.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender_worker.c?rev=603292&r1=603291&r2=603292&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender_worker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender_worker.c Tue Dec 11
08:38:30 2007
@@ -353,12 +353,14 @@
msg_stored_key);
}
}
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2]msg_type:%d",
msg_type);
if(successfully_sent)
{
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2]message of msg_type:%d successfully sent", msg_type);
if(AXIS2_FALSE == axis2_msg_ctx_get_server_side(msg_ctx, env))
sandesha2_sender_worker_check_for_sync_res(env, msg_ctx);
}
- msg_type = sandesha2_msg_ctx_get_msg_type(rm_msg_ctx, env);
if(SANDESHA2_MSG_TYPE_TERMINATE_SEQ == msg_type)
{
sandesha2_terminate_seq_t *terminate_seq = NULL;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
