svn commit: r696685 - in /webservices/sandesha/trunk/c/src: msgprocessors/app_msg_processor.c msgprocessors/make_connection_msg_processor.c util/msg_retrans_adjuster.c util/sandesha2_utils.c util/seq_mgr.c util/terminate_mgr.c

Author: damitha
Date: Thu Sep 18 09:12:45 2008
New Revision: 696685

URL: http://svn.apache.org/viewvc?rev=696685&view=rev
Log:
Working on RM Policy

Modified:
    webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
    webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
    webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c
    webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
    webservices/sandesha/trunk/c/src/util/seq_mgr.c
    webservices/sandesha/trunk/c/src/util/terminate_mgr.c

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?rev=696685&r1=696684&r2=696685&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Thu Sep 18 09:12:45 2008
@@ -316,18 +316,15 @@
     app_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
     if(!app_msg_ctx)
     {
-        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-            "[sandesha2]Message context is not set");
-        AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_MSG_CTX, 
-            AXIS2_FAILURE);
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Message context is not set");
+        AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_MSG_CTX, AXIS2_FAILURE);
         return AXIS2_FAILURE;
     }
 
     svc = axis2_msg_ctx_get_svc(app_msg_ctx, env);
     if(!svc)
     {
-        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-            "[sandesha2][app_msg_propcessor.c] service is NULL");
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Service is NULL");
         return AXIS2_FAILURE;
     }
 
@@ -1877,7 +1874,7 @@
     sandesha2_sender_bean_t *ack_bean = NULL;
     sandesha2_seq_property_bean_t *rms_internal_sequence_bean = NULL;
     axis2_char_t *internal_sequence_id = NULL;
-    axis2_bool_t sent = AXIS2_FALSE;
+    axis2_bool_t sent = AXIS2_TRUE;
     axis2_op_ctx_t *op_ctx = NULL;
     axis2_op_t *op = NULL;
     int mep = -1;
@@ -2232,16 +2229,14 @@
     svc = axis2_msg_ctx_get_svc(msg_ctx, env);
     if(!svc)
     {
-        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-            "[sandesha2][app_msg_propcessor.c] service is NULL");
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Service is NULL");
         return AXIS2_FAILURE;
     }
 
     property_bean = sandesha2_utils_get_property_bean(env, svc);
     if(!property_bean)
     {
-        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-            "[sandesha2][app_msg_propcessor.c] Property bean is NULL");
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Property bean is NULL");
         return AXIS2_FAILURE;
     }
 

Modified: webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c?rev=696685&r1=696684&r2=696685&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c Thu Sep 18 09:12:45 2008
@@ -486,7 +486,7 @@
         return AXIS2_SUCCESS;
     }
     
-    prop_bean = sandesha2_utils_get_property_bean(env, svc/*axis2_conf_ctx_get_conf(conf_ctx, env)*/);
+    prop_bean = sandesha2_utils_get_property_bean(env, svc);
     if(prop_bean)
     {
         msgs_not_to_send = sandesha2_property_bean_get_msg_types_to_drop(prop_bean, env);

Modified: webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c?rev=696685&r1=696684&r2=696685&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c Thu Sep 18 09:12:45 2008
@@ -87,8 +87,6 @@
 
     internal_sequence_id = sandesha2_sender_bean_get_internal_seq_id(sender_bean, env);
    
-    /*property_bean = sandesha2_utils_get_property_bean(env, axis2_conf_ctx_get_conf(conf_ctx, env));*/
-
     property_bean = sandesha2_utils_get_property_bean(env, svc);
 
     sent_count = sandesha2_sender_bean_get_sent_count(sender_bean, env) + 1;

Modified: webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/sandesha2_utils.c?rev=696685&r1=696684&r2=696685&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Thu Sep 18 09:12:45 2008
@@ -215,25 +215,23 @@
 AXIS2_EXTERN sandesha2_property_bean_t* AXIS2_CALL
 sandesha2_utils_get_property_bean(
     const axutil_env_t *env,
-    axis2_svc_t *svc
-    /*axis2_conf_t *conf*/)
+    axis2_svc_t *svc)
     
 {
     axutil_param_t *param = NULL;
     
-    AXIS2_PARAM_CHECK(env->error, svc/*conf*/, NULL);
+    AXIS2_PARAM_CHECK(env->error, svc, NULL);
     
-    /*param = axis2_conf_get_param(conf, env, SANDESHA2_SANDESHA_PROPERTY_BEAN);*/
     param = axis2_svc_get_param(svc, env, SANDESHA2_SANDESHA_PROPERTY_BEAN);
     if(!param)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Configuration not set");
-        AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONFIGURATION_NOT_SET,
-            AXIS2_FAILURE);
+        AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONFIGURATION_NOT_SET, AXIS2_FAILURE);
+
         return NULL;
     }
+
     return (sandesha2_property_bean_t*)axutil_param_get_value(param, env);
-    
 }
 
 AXIS2_EXTERN axutil_array_list_t* AXIS2_CALL

Modified: webservices/sandesha/trunk/c/src/util/seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/seq_mgr.c?rev=696685&r1=696684&r2=696685&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/seq_mgr.c Thu Sep 18 09:12:45 2008
@@ -294,8 +294,7 @@
     const axutil_env_t *env,
     axis2_char_t *property_key,
     sandesha2_seq_property_mgr_t *seq_prop_mgr,
-    axis2_svc_t *svc
-    /*axis2_conf_ctx_t *conf_ctx*/)
+    axis2_svc_t *svc)
 {
     sandesha2_property_bean_t *property_bean = NULL;
     axis2_bool_t seq_timedout = AXIS2_FALSE;
@@ -308,7 +307,7 @@
     AXIS2_PARAM_CHECK(env->error, property_key, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, seq_prop_mgr, AXIS2_FALSE);
     
-    property_bean = sandesha2_utils_get_property_bean(env, svc/*axis2_conf_ctx_get_conf(conf_ctx, env)*/);
+    property_bean = sandesha2_utils_get_property_bean(env, svc);
     timeout_interval = sandesha2_property_bean_get_inactive_timeout_interval(property_bean, env);
     if(timeout_interval <= 0)
     {

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?rev=696685&r1=696684&r2=696685&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Thu Sep 18 09:12:45 2008
@@ -870,16 +870,14 @@
     svc = axis2_msg_ctx_get_svc(ack_msg_ctx, env);
     if(!svc)
     {
-        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-            "[sandesha2][terminate_mgr.c] service is NULL");
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Service is NULL");
         return AXIS2_FAILURE;
     }
 
     property_bean = sandesha2_utils_get_property_bean(env, svc);
     if(!property_bean)
     {
-        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
-            "[sandesha2][terminate_mgr.c] Property bean is NULL");
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Property bean is NULL");
         return AXIS2_FAILURE;
     }
     
@@ -1051,7 +1049,6 @@
     terminate_sender_bean = sandesha2_sender_bean_create(env);
     sandesha2_sender_bean_set_msg_ctx_ref_key(terminate_sender_bean, env, key);
     /*sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, key, terminate_msg_ctx, AXIS2_TRUE);*/
-    property_bean = sandesha2_utils_get_property_bean(env, svc/*axis2_conf_ctx_get_conf(conf_ctx, env)*/);
     terminate_delay = sandesha2_property_bean_get_terminate_delay(property_bean, env); 
     send_time = sandesha2_utils_get_current_time_in_millis(env) + terminate_delay;
     sandesha2_sender_bean_set_time_to_send(terminate_sender_bean, env, send_time);