Author: damitha
Date: Wed Feb 21 22:20:26 2007
New Revision: 510414
URL: http://svn.apache.org/viewvc?view=rev&rev=510414
Log:
Fixed SANDESHA2C-24
Modified:
webservices/sandesha/trunk/c/config/module.xml
webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
Modified: webservices/sandesha/trunk/c/config/module.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/config/module.xml?view=diff&rev=510414&r1=510413&r2=510414
==============================================================================
--- webservices/sandesha/trunk/c/config/module.xml (original)
+++ webservices/sandesha/trunk/c/config/module.xml Wed Feb 21 22:20:26 2007
@@ -68,7 +68,7 @@
</operation>
<!-- Database connection parameters -->
- <parameter name="sandesha2_db" locked="false">/axis2c/deploy</parameter>
+ <parameter name="sandesha2_db" locked="false">/tmp</parameter>
<!-- General parameters -->
<parameter name="ExponentialBackoff" locked="false">AXIS2_TRUE</parameter>
<parameter name="RetransmissionInterval" locked="false">20000</parameter>
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?view=diff&rev=510414&r1=510413&r2=510414
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
(original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Wed
Feb 21 22:20:26 2007
@@ -117,7 +117,12 @@
AXIS2_LOG_INFO(env->log,
"[sandesha2]Starting sandesha2 global in handler ......");
-
+ is_rm_global_msg = sandesha2_utils_is_rm_global_msg(env, msg_ctx);
+ if(!is_rm_global_msg)
+ {
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Not a global RM Message");
+ return AXIS2_SUCCESS;
+ }
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
if(!conf_ctx)
{
@@ -224,24 +229,7 @@
}
}
}
- is_rm_global_msg = sandesha2_utils_is_rm_global_msg(env, msg_ctx);
- if(!is_rm_global_msg)
- {
- if(!within_transaction)
- {
- axis2_property_t *prop = NULL;
- if (transaction)
- sandesha2_transaction_rollback(transaction, env);
- prop = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
- AXIS2_FALSE, 0, SANDESHA2_VALUE_FALSE);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
- prop, AXIS2_FALSE);
- rolled_back = AXIS2_TRUE;
-
- }
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Not a global RM Message");
- return AXIS2_SUCCESS;
- }
+
rm_msg_ctx = sandesha2_msg_init_init_msg(env, msg_ctx);
dropped = sandesha2_global_in_handler_drop_if_duplicate(handler, env,
rm_msg_ctx, storage_mgr);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
