Author: sahan
Date: Thu Aug 3 04:59:30 2006
New Revision: 428373
URL: http://svn.apache.org/viewvc?rev=428373&view=rev
Log:
Fixing some bugs
Modified:
webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
webservices/sandesha/trunk/c/src/util/msg_creator.c
webservices/sandesha/trunk/c/src/workers/sender.c
webservices/sandesha/trunk/c/src/wsrm/rm_elements.c
Modified:
webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c?rev=428373&r1=428372&r2=428373&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
(original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Thu
Aug 3 04:59:30 2006
@@ -121,7 +121,8 @@
}
property = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_REINJECTED_MESSAGE,
AXIS2_FALSE);
- reinjected_msg = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+ if(NULL != property)
+ reinjected_msg = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(property,
env);
if(reinjected_msg && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE,
reinjected_msg))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Detected"
@@ -138,7 +139,8 @@
}
property = AXIS2_CTX_GET_PROPERTY(ctx, env,
SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
- within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
+ if(NULL != property)
+ within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
property, env);
if(within_transaction_str && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE,
within_transaction_str))
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c?rev=428373&r1=428372&r2=428373&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c Thu Aug 3
04:59:30 2006
@@ -107,7 +107,9 @@
return AXIS2_SUCCESS;
temp_prop = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_REINJECTED_MESSAGE,
AXIS2_FALSE);
- reinjected_msg = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(temp_prop,
env);
+ if(NULL != temp_prop)
+ reinjected_msg = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(temp_prop,
+ env);
if(reinjected_msg && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE,
reinjected_msg))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
@@ -119,7 +121,9 @@
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
temp_prop = AXIS2_CTX_GET_PROPERTY(ctx, env,
SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
- within_transaction_str = (axis2_char_t *)
AXIS2_PROPERTY_GET_VALUE(temp_prop, env);
+ if(NULL != temp_prop)
+ within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
+ temp_prop, env);
if(within_transaction_str && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE,
within_transaction_str))
{
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c?rev=428373&r1=428372&r2=428373&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
(original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c Thu
Aug 3 04:59:30 2006
@@ -224,7 +224,7 @@
AXIS2_MSG_CTX_SET_REPLY_TO(ack_msg_ctx, env, AXIS2_MSG_CTX_GET_TO(msg_ctx,
env));
sandesha2_msg_creator_add_ack_msg(env, ack_rm_msg, seq_id, storage_mgr);
- AXIS2_MSG_CTX_SET_SVR_SIDE(ack_msg_ctx, env, AXIS2_TRUE);
+ AXIS2_MSG_CTX_SET_SERVER_SIDE(ack_msg_ctx, env, AXIS2_TRUE);
property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, AXIS2_WSA_VERSION,
AXIS2_FALSE);
Modified: webservices/sandesha/trunk/c/src/util/msg_creator.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_creator.c?rev=428373&r1=428372&r2=428373&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Thu Aug 3 04:59:30 2006
@@ -122,7 +122,10 @@
/* Creating by copying common contents. (This will not see contexts except
* for conf_ctx)
*/
- create_seq_op = axis2_op_create(env);
+ qname = axis2_qname_create(env, "CreateSequenceOperation", NULL, NULL);
+ create_seq_op = axis2_op_create_with_qname(env, qname);
+ AXIS2_QNAME_FREE(qname, env);
+
create_seq_msg_ctx = sandesha2_utils_create_new_related_msg_ctx(env,
application_rm_msg, create_seq_op);
sandesha2_msg_creator_init_creation(env, application_msg_ctx,
@@ -134,9 +137,6 @@
create_seq_op_ctx);
app_msg_op_desc = AXIS2_MSG_CTX_GET_OP(application_msg_ctx, env);
create_seq_op = AXIS2_MSG_CTX_GET_OP(create_seq_msg_ctx, env);
- qname = axis2_qname_create(env, "CreateSequenceOperation", NULL, NULL);
- AXIS2_OP_SET_QNAME(create_seq_op, env, qname);
- AXIS2_QNAME_FREE(qname, env);
if(app_msg_op_desc)
{
axis2_array_list_t *outflow = NULL;
@@ -155,7 +155,10 @@
}
AXIS2_MSG_CTX_SET_OP(create_seq_msg_ctx, env, create_seq_op);
temp_to = SANDESHA2_MSG_CTX_GET_TO(application_rm_msg, env);
- AXIS2_MSG_CTX_SET_TO(create_seq_msg_ctx, env, temp_to);
+ to_epr = axis2_endpoint_ref_create(env, AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ temp_to, env));
+ AXIS2_MSG_CTX_SET_TO(create_seq_msg_ctx, env, to_epr);
+ to_epr = NULL;
temp_reply_to = SANDESHA2_MSG_CTX_GET_REPLY_TO(application_rm_msg, env);
AXIS2_MSG_CTX_SET_REPLY_TO(create_seq_msg_ctx, env, temp_reply_to);
create_seq_rm_msg = sandesha2_msg_ctx_create(env, create_seq_msg_ctx);
@@ -610,7 +613,7 @@
SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(ref_rm_msg, env);
sandesha2_msg_creator_finalize_creation(env, SANDESHA2_MSG_CTX_GET_MSG_CTX(
ref_rm_msg, env), out_msg);
- AXIS2_MSG_CTX_SET_SVR_SIDE(SANDESHA2_MSG_CTX_GET_MSG_CTX(ref_rm_msg, env),
+ AXIS2_MSG_CTX_SET_SERVER_SIDE(SANDESHA2_MSG_CTX_GET_MSG_CTX(ref_rm_msg,
env),
env, AXIS2_TRUE);
return res_rm_msg;
}
Modified: webservices/sandesha/trunk/c/src/workers/sender.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender.c?rev=428373&r1=428372&r2=428373&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender.c Thu Aug 3 04:59:30 2006
@@ -328,7 +328,7 @@
env), AXIS2_MSG_CTX_GET_TRANSPORT_IN_DESC(
msg_ctx, env),
AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx,
env));
- AXIS2_MSG_CTX_SET_SVR_SIDE(res_msg_ctx, env, AXIS2_FALSE);
+ AXIS2_MSG_CTX_SET_SERVER_SIDE(res_msg_ctx, env, AXIS2_FALSE);
AXIS2_MSG_CTX_SET_PROPERTY(res_msg_ctx, env, AXIS2_TRANSPORT_IN,
AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
AXIS2_TRANSPORT_IN,
AXIS2_FALSE), AXIS2_FALSE);
@@ -377,7 +377,7 @@
env));
if(AXIS2_FALSE == sandesha2_sender_is_fault_envelope(sender, env,
res_envelope))
- AXIS2_ENGINE_RECIEVE_FAULT(engine, env, res_msg_ctx);
+ AXIS2_ENGINE_RECEIVE_FAULT(engine, env, res_msg_ctx);
else
AXIS2_ENGINE_RECIEVE(engine, env, res_msg_ctx);
}
@@ -586,7 +586,7 @@
}
if(AXIS2_TRUE == successfully_sent)
{
- if(AXIS2_FALSE == AXIS2_MSG_CTX_IS_SVR_SIDE(msg_ctx, env))
+ if(AXIS2_FALSE == AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env))
sandesha2_sender_check_for_sync_res(sender, env, msg_ctx);
}
if(SANDESHA2_MSG_TYPE_TERMINATE_SEQ == SANDESHA2_MSG_CTX_GET_MSG_TYPE(
@@ -607,7 +607,7 @@
int_seq_id = sandesha2_utils_get_seq_property(env, seq_id,
SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID, storage_mgr);
sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx,
- int_seq_id, AXIS2_MSG_CTX_IS_SVR_SIDE(msg_ctx, env),
+ int_seq_id, AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx,
env),
storage_mgr);
}
property = axis2_property_create(env);
Modified: webservices/sandesha/trunk/c/src/wsrm/rm_elements.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/rm_elements.c?rev=428373&r1=428372&r2=428373&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/rm_elements.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/rm_elements.c Thu Aug 3 04:59:30 2006
@@ -352,8 +352,12 @@
if(NULL == elements_impl->rm_ns_val)
return AXIS2_SUCCESS;
- elements_impl->addr_ns_val =
sandesha2_rm_elements_get_addr_ns_val_from_env(
+ addr_ns_val = sandesha2_rm_elements_get_addr_ns_val_from_env(
rm_elements, env, soap_envelope, action);
+ if(NULL != addr_ns_val)
+ elements_impl->addr_ns_val = addr_ns_val;
+
+ addr_ns_val = NULL;
if(NULL == elements_impl->addr_ns_val)
{
@@ -399,8 +403,8 @@
env, qname, body_node, &create_seq_node);
if(NULL != create_seq_node)
{
- elements_impl->create_seq = sandesha2_create_seq_create(env,
rm_ns_val,
- addr_ns_val);
+ elements_impl->create_seq = sandesha2_create_seq_create(env,
+ addr_ns_val, rm_ns_val);
SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(elements_impl->create_seq, env,
body_node);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
