You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by da...@apache.org on 2007/02/21 12:45:09 UTC
svn commit: r509974 - in /webservices/sandesha/trunk/c/src:
msgprocessors/ack_msg_processor.c msgprocessors/app_msg_processor.c
storage/permanent/permanent_storage_mgr.c
transport/sandesha2_transport_sender.c util/terminate_mgr.c
Author: damitha
Date: Wed Feb 21 03:45:08 2007
New Revision: 509974
URL: http://svn.apache.org/viewvc?view=rev&rev=509974
Log:
rm_echo_single_1_0 sample is now working with latest changes of the axis2c
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c?view=diff&rev=509974&r1=509973&r2=509974
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c Wed Feb 21 03:45:08 2007
@@ -228,8 +228,8 @@
AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
}
if(int_seq_id)
- sandesha2_seq_mgr_update_last_activated_time(env, int_seq_id,
- storage_mgr);
+ sandesha2_seq_mgr_update_last_activated_time(env, int_seq_id,
+ storage_mgr);
property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_ACK_PROCSSED, property,
AXIS2_FALSE);
@@ -312,8 +312,7 @@
no_of_msgs_acked_bean);
}
completed_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr,
- env, out_seq_id,
- SANDESHA2_SEQ_PROP_CLIENT_COMPLETED_MESSAGES);
+ env, out_seq_id, SANDESHA2_SEQ_PROP_CLIENT_COMPLETED_MESSAGES);
if(!completed_bean && int_seq_id)
{
completed_bean = sandesha2_seq_property_bean_create(env);
@@ -329,7 +328,6 @@
sandesha2_seq_property_bean_set_value(completed_bean, env, str_list);
sandesha2_seq_property_mgr_update(seq_prop_mgr, env, completed_bean);
}
-
last_out_msg_no_str = sandesha2_utils_get_seq_property(env, int_seq_id,
SANDESHA2_SEQ_PROP_LAST_OUT_MESSAGE_NO, storage_mgr);
if(last_out_msg_no_str)
Modified: webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c?view=diff&rev=509974&r1=509973&r2=509974
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Wed Feb 21 03:45:08 2007
@@ -490,13 +490,11 @@
if(axis2_msg_ctx_get_to(msg_ctx, env) &&
sandesha2_utils_is_single_channel(env, rm_version, reply_to_addr))
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "*******************single channel1******************");
/* Do nothing */
}
else
if(sandesha2_utils_is_single_channel(env, rm_version, to_addr))
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "*******************single channel2******************");
sandesha2_app_msg_processor_send_ack_if_reqd(env, rm_msg_ctx, msgs_str,
storage_mgr);
}
@@ -1274,7 +1272,7 @@
rm_version = sandesha2_utils_get_rm_version(env, internal_seq_id, storage_mgr);
if(!rm_version)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Unable to fine RM spec version");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Unable to find RM spec version");
return AXIS2_FAILURE;
}
rm_ns_val = sandesha2_spec_specific_consts_get_rm_ns_val(env, rm_version);
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c?view=diff&rev=509974&r1=509973&r2=509974
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c Wed Feb 21 03:45:08 2007
@@ -724,8 +724,9 @@
action = (axis2_char_t *) AXIS2_OPTIONS_GET_ACTION(options, env);
sandesha2_msg_store_bean_set_action(bean, env, action);
prop_str = sandesha2_permanent_storage_mgr_get_property_string(env, msg_ctx);
- sandesha2_msg_store_bean_set_persistent_property_str(bean, env,
- prop_str);
+ if (prop_str)
+ sandesha2_msg_store_bean_set_persistent_property_str(bean, env,
+ prop_str);
/* setting the request message if this a response message.*/
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
@@ -989,13 +990,13 @@
persistent_prop_str =
sandesha2_msg_store_bean_get_persistent_property_str(msg_store_bean,
env);
- if(persistent_prop_str && 0 != AXIS2_STRCMP("", AXIS2_STRTRIM(env,
- persistent_prop_str, NULL)))
+ if(persistent_prop_str && 0 != AXIS2_STRCMP("", persistent_prop_str))
{
axis2_hash_t *map =
sandesha2_permanent_storage_mgr_get_property_map_from_string(env,
persistent_prop_str);
axis2_hash_index_t *index = NULL;
+ if(map)
for (index = axis2_hash_first(map, env); index; index =
axis2_hash_next(env, index))
{
@@ -1018,7 +1019,7 @@
const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx)
{
- axis2_char_t *prop_str = NULL;
+ axis2_char_t *prop_str = "";
axis2_property_t *property = NULL;
axis2_options_t *options = (axis2_options_t *) AXIS2_MSG_CTX_GET_OPTIONS(
msg_ctx, env);
@@ -1030,11 +1031,10 @@
if(property)
{
axis2_char_t *value = AXIS2_PROPERTY_GET_VALUE(property, env);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "*************qualified for sending added value = %s", value);
prop_str = axis2_strcat(env, SANDESHA2_QUALIFIED_FOR_SENDING,
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR, value, NULL);
}
- else
+ /*else
{
property = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
AXIS2_FALSE, 0, SANDESHA2_VALUE_FALSE);
@@ -1042,8 +1042,7 @@
property, AXIS2_FALSE);
prop_str = axis2_strcat(env, SANDESHA2_QUALIFIED_FOR_SENDING,
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR, SANDESHA2_VALUE_FALSE, NULL);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "*************qualified for sending added value = %s", SANDESHA2_VALUE_FALSE);
- }
+ }*/
property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
AXIS2_WSA_VERSION, AXIS2_FALSE);
if(property)
@@ -1056,7 +1055,7 @@
prop_str = axis2_strcat(env, temp_str,
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR, AXIS2_WSA_VERSION,
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR, value, NULL);
- if(temp_str)
+ if(temp_str && 0 < axis2_strlen(temp_str))
AXIS2_FREE(env->allocator, temp_str);
}
}
@@ -1093,7 +1092,7 @@
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR, key,
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR,
value, NULL);
- if(temp_str)
+ if(temp_str && axis2_strlen(temp_str)> 0)
AXIS2_FREE(env->allocator, temp_str);
}
}
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?view=diff&rev=509974&r1=509973&r2=509974
==============================================================================
--- webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c (original)
+++ webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c Wed Feb 21 03:45:08 2007
@@ -183,9 +183,8 @@
storage_man = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "*****************qualified for sending *****************");
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_QUALIFIED_FOR_SENDING,
- property, AXIS2_FALSE);
+ property, AXIS2_FALSE);
sandesha2_storage_mgr_update_msg_ctx(storage_man, env, key, msg_ctx);
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/util/terminate_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/terminate_mgr.c?view=diff&rev=509974&r1=509973&r2=509974
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Wed Feb 21 03:45:08 2007
@@ -640,15 +640,17 @@
to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, int_seq_id,
SANDESHA2_SEQ_PROP_TO_EPR);
- to_epr = axis2_endpoint_ref_create(env,
- sandesha2_seq_property_bean_get_value(to_bean, env));
- if(!to_epr)
+ if(to_bean)
+ to_epr = axis2_endpoint_ref_create(env,
+ sandesha2_seq_property_bean_get_value(to_bean, env));
+ /*if(!to_epr)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] To EPR has an "
"invalid value");
return AXIS2_FAILURE;
- }
- to_addr = axis2_endpoint_ref_get_address(to_epr, env);
+ }*/
+ if(to_epr)
+ to_addr = axis2_endpoint_ref_get_address(to_epr, env);
sandesha2_msg_ctx_set_to(terminate_rm_msg, env, to_epr);
rm_ver = sandesha2_utils_get_rm_version(env, int_seq_id, storage_mgr);
if(!rm_ver)
@@ -757,13 +759,8 @@
{
axis2_endpoint_ref_t *reply_to_epr = NULL;
reply_to_epr = axis2_msg_ctx_get_to(msg_ctx, env);
- if(!reply_to_epr)
- {
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Reply To EPR "
- "has an invalid value");
- return AXIS2_FAILURE;
- }
- axis2_msg_ctx_set_reply_to(msg_ctx1, env, reply_to_epr);
+ if(reply_to_epr)
+ axis2_msg_ctx_set_reply_to(msg_ctx1, env, reply_to_epr);
}
engine = axis2_engine_create(env, conf_ctx);
return AXIS2_ENGINE_SEND(engine, env, msg_ctx1);
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org