ws-fx-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r470274 - in /webservices/sandesha/trunk/c/src: handlers/sandesha2_out_handler.c msgprocessors/app_msg_processor.c util/fault_mgr.c util/seq_mgr.c workers/in_order_invoker.c
Date Thu, 02 Nov 2006 08:33:53 GMT
Author: damitha
Date: Thu Nov  2 00:33:52 2006
New Revision: 470274

URL: http://svn.apache.org/viewvc?view=rev&rev=470274
Log:
Now the rm_echo rm_echo_blocking and rm_ping are working with apache2 with
ServerLimit=1

Modified:
    webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
    webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
    webservices/sandesha/trunk/c/src/util/fault_mgr.c
    webservices/sandesha/trunk/c/src/util/seq_mgr.c
    webservices/sandesha/trunk/c/src/workers/in_order_invoker.c

Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c?view=diff&rev=470274&r1=470273&r2=470274
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c Thu Nov  2 00:33:52
2006
@@ -72,9 +72,9 @@
 
 axis2_status_t AXIS2_CALL
 sandesha2_out_handler_invoke(
-        struct axis2_handler *handler, 
-        const axis2_env_t *env,
-        struct axis2_msg_ctx *msg_ctx)
+    struct axis2_handler *handler, 
+    const axis2_env_t *env,
+    struct axis2_msg_ctx *msg_ctx)
 {
     axis2_property_t *temp_prop = NULL;
     axis2_conf_ctx_t *conf_ctx = NULL;
@@ -97,16 +97,18 @@
     AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
     
     AXIS2_LOG_INFO(env->log, "[sandesha2] Starting out handler .........");
+    printf("[sandesha2] Starting out handler .........\n");
     conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
-    if(conf_ctx == NULL)
+    if(!conf_ctx)
     {
         AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Configuration Context is
NULL");
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONF_CTX_NULL, AXIS2_FAILURE);
         return AXIS2_FAILURE;
     }
     svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
-    if(svc == NULL)
+    if(!svc)
     {
+        printf("came1 .........\n");
         AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Axis2 Service is NULL");
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SVC_NULL, AXIS2_FAILURE);
         return AXIS2_FAILURE;
@@ -114,7 +116,7 @@
     ctx = AXIS2_MSG_CTX_GET_BASE(msg_ctx, env);
     temp_prop = AXIS2_CTX_GET_PROPERTY(ctx, env, 
             SANDESHA2_APPLICATION_PROCESSING_DONE, AXIS2_FALSE);
-    if(NULL != temp_prop)
+    if(temp_prop)
         str_done = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(temp_prop, env); 
     if(str_done && 0 == AXIS2_STRCMP(SANDESHA2_VALUE_TRUE, str_done))
     {
@@ -123,6 +125,7 @@
                     Processing Done");
         return AXIS2_SUCCESS; 
     }
+    printf("came2 .........\n");
     temp_prop = axis2_property_create(env);
     AXIS2_PROPERTY_SET_SCOPE(temp_prop, env, AXIS2_SCOPE_APPLICATION);
     AXIS2_PROPERTY_SET_VALUE(temp_prop, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE, 
@@ -133,7 +136,7 @@
     storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
     temp_prop = AXIS2_CTX_GET_PROPERTY(ctx, env, 
             SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
-    if(NULL != temp_prop)
+    if(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, 
@@ -141,7 +144,7 @@
     {
         within_transaction = AXIS2_TRUE;
     }
-    if(AXIS2_TRUE != within_transaction)
+    if(!within_transaction)
     {
         axis2_property_t *prop = NULL;
         
@@ -152,6 +155,7 @@
         AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION, prop, 
                 AXIS2_FALSE);
     }
+    printf("came3 .........\n");
     /* Getting rm message */ 
     rm_msg_ctx = sandesha2_msg_init_init_msg(env, msg_ctx);
     temp_prop = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_CLIENT_DUMMY_MESSAGE, 
@@ -165,6 +169,7 @@
     msg_type = SANDESHA2_MSG_CTX_GET_MSG_TYPE(rm_msg_ctx, env);
     if(msg_type == SANDESHA2_MSG_TYPE_UNKNOWN)
     {
+        printf("came4 .........\n");
         axis2_msg_ctx_t *req_msg_ctx = NULL;
         axis2_op_ctx_t *op_ctx = NULL;
 
@@ -173,6 +178,7 @@
                 AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
         if(req_msg_ctx) /* For the server side */
         {
+            printf("came44 .........\n");
             sandesha2_msg_ctx_t *req_rm_msg_ctx = NULL;
             sandesha2_seq_t *seq_part = NULL;
 
@@ -182,24 +188,28 @@
             
             if(seq_part)
             {
+                printf("came444 .........\n");
                 msg_processor = (sandesha2_msg_processor_t *) 
                     sandesha2_app_msg_processor_create(env); /* rm 
                                                                 intended msg */
             }
         }
-        else if(AXIS2_TRUE != AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env))
+        else if(!AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env))
         {
+            printf("came4444 .........\n");
             msg_processor = (sandesha2_msg_processor_t *) 
                 sandesha2_app_msg_processor_create(env);
         }
     }
     else
     {
+        printf("came5 .........\n");
         msg_processor = sandesha2_msg_processor_create_msg_processor(env, 
                 rm_msg_ctx);
     }
     if(msg_processor)
     {
+        printf("came6 .........\n");
         SANDESHA2_MSG_PROCESSOR_PROCESS_OUT_MSG(msg_processor, env, rm_msg_ctx);
     }
     if(AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
@@ -207,7 +217,7 @@
         /* Message should not be sent in an exception situation */
         AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
         /* Rolling back the transaction */
-        if(AXIS2_TRUE != within_transaction)
+        if(!within_transaction)
         {
             axis2_property_t *prop = NULL;
 
@@ -224,7 +234,7 @@
                 AXIS2_FAILURE);
         return AXIS2_FAILURE;
     }
-    if(AXIS2_TRUE != within_transaction && AXIS2_TRUE != rolled_back)
+    if(!within_transaction && !rolled_back)
     {
         axis2_property_t *prop = NULL;
 

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=470274&r1=470273&r2=470274
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Thu Nov  2 00:33:52
2006
@@ -206,7 +206,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
     AXIS2_LOG_INFO(env->log, 
-            "[sandesha2] sandesha2_app_msg_processor_process_in_msg .........");
+            "[sandesha2] sandesha2_app_msg_processor_process_in_msg .........*******************");
     printf("sandesha2_app_msg_processor_process_in_msg\n");
    
     seq_ack = (sandesha2_seq_ack_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, 
@@ -270,6 +270,8 @@
                         fault_mgr, env, rm_msg_ctx, storage_mgr);
     if(fault_ctx)
     {
+        AXIS2_LOG_INFO(env->log, 
+            "[sandesha2] came3 .........");
         axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
         if(AXIS2_FAILURE == AXIS2_ENGINE_SEND_FAULT(engine, env, 
                         SANDESHA2_MSG_CTX_GET_MSG_CTX(fault_ctx, env)))
@@ -288,10 +290,12 @@
     SANDESHA2_SEQ_SET_MUST_UNDERSTAND(seq, env, AXIS2_FALSE);
     str_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
                         SANDESHA2_SEQ_GET_IDENTIFIER(seq, env), env);
+    AXIS2_LOG_INFO(env->log, "[sandesha2] str_seq_id :%s.........", str_seq_id);
     fault_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_UNKNOWN_SEQ(fault_mgr, env,
                         rm_msg_ctx, str_seq_id, storage_mgr);
     if(fault_ctx)
     {
+        AXIS2_LOG_INFO(env->log, "[sandesha2] came4 .........");
         axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
         if(AXIS2_FAILURE == AXIS2_ENGINE_SEND_FAULT(engine, env, 
                         SANDESHA2_MSG_CTX_GET_MSG_CTX(fault_ctx, env)))
@@ -304,11 +308,15 @@
         return AXIS2_SUCCESS;
     }
     SANDESHA2_SEQ_SET_MUST_UNDERSTAND(seq, env, AXIS2_FALSE);
+    AXIS2_LOG_INFO(env->log, 
+            "[sandesha2] came5 .........");
     SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(rm_msg_ctx, env);
     fault_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_SEQ_CLOSED(fault_mgr, env, 
                         rm_msg_ctx, str_seq_id, storage_mgr);
     if(fault_ctx)
     {
+        AXIS2_LOG_INFO(env->log, 
+            "[sandesha2] came6 .........");
         axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
         if(AXIS2_FAILURE == AXIS2_ENGINE_SEND_FAULT(engine, env, 
                         SANDESHA2_MSG_CTX_GET_MSG_CTX(fault_ctx, env)))
@@ -530,6 +538,8 @@
     axis2_char_t *msg_id = NULL;
     axis2_char_t *op_name = NULL;
     axis2_char_t *to_addr = NULL;
+    axis2_op_ctx_t *op_ctx = NULL;
+    axis2_msg_ctx_t *req_msg_ctx = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
@@ -539,6 +549,9 @@
   
     msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
     conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
+    op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
+    req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env, 
+            AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
     /* TODO setting up fault callback */
     
     storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
@@ -548,7 +561,7 @@
     is_svr_side = AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env);
     
     to_epr = AXIS2_MSG_CTX_GET_TO(msg_ctx, env);
-    if(NULL == to_epr || NULL == AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env)
+    if(!to_epr || !AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env)
                     || 0 == AXIS2_STRLEN(AXIS2_ENDPOINT_REF_GET_ADDRESS(
                     to_epr, env)))
     {
@@ -557,27 +570,22 @@
         return AXIS2_FAILURE;
     }
     
-    if(NULL == AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env))
+    if(!AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env))
         AXIS2_MSG_CTX_SET_MESSAGE_ID(msg_ctx, env, axis2_uuid_gen(env));
     storage_key = axis2_uuid_gen(env);
     
-    if(AXIS2_TRUE == is_svr_side)
+    if(is_svr_side)
     {
         sandesha2_seq_t *req_seq = NULL;
         long request_msg_no = -1;
         axis2_char_t *req_last_msg_num_str = NULL;
         axis2_char_t *incoming_seq_id = NULL;
-        axis2_op_ctx_t *op_ctx = NULL;
-        axis2_ctx_t *ctx = NULL;
-        axis2_property_t *property = NULL;
+        sandesha2_msg_ctx_t *req_rm_msg_ctx = NULL;
        
-        op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
-        ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
-        property = AXIS2_CTX_GET_PROPERTY(ctx, env, 
-            SANDESHA2_WSRM_COMMON_SEQ, AXIS2_FALSE);
-        req_seq = (sandesha2_seq_t *)  AXIS2_PROPERTY_GET_VALUE(property, 
-                env);
-        if(NULL == req_seq)
+        req_rm_msg_ctx = sandesha2_msg_init_init_msg(env, req_msg_ctx);
+        req_seq = (sandesha2_seq_t *) SANDESHA2_MSG_CTX_GET_MSG_PART(
+                req_rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ);
+        if(!req_seq)
         {
             AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Sequence is NULL");
             AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SEQ_NOT_EXIST, 
@@ -586,7 +594,7 @@
         }
         incoming_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
                         SANDESHA2_SEQ_GET_IDENTIFIER(req_seq, env), env);
-        if(NULL == incoming_seq_id)
+        if(!incoming_seq_id)
         {
             AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Sequence ID is NULL");
             return AXIS2_FAILURE;
@@ -598,7 +606,7 @@
         req_last_msg_num_str = sandesha2_utils_get_seq_property(env, 
                         incoming_seq_id, SANDESHA2_SEQ_PROP_LAST_IN_MESSAGE_NO, 
                         storage_mgr);
-        if(NULL != req_last_msg_num_str)
+        if(req_last_msg_num_str)
         {
             long req_last_msg_num = atol(req_last_msg_num_str);
             if(req_last_msg_num == request_msg_no)
@@ -620,15 +628,15 @@
                         to, seq_key);
         property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, 
                         SANDESHA2_CLIENT_LAST_MESSAGE, AXIS2_FALSE);
-        if(NULL != property)
+        if(property)
             last_app_msg = AXIS2_PROPERTY_GET_VALUE(property, env);
-        if(NULL != last_app_msg && 0 == AXIS2_STRCMP(last_app_msg, 
+        if(last_app_msg && 0 == AXIS2_STRCMP(last_app_msg, 
                         SANDESHA2_VALUE_TRUE))
             last_msg = AXIS2_TRUE;            
     }
     property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, 
                         SANDESHA2_CLIENT_MESSAGE_NUMBER, AXIS2_FALSE);
-    if(NULL != property)
+    if(property)
     {
         msg_num_lng = *(long*)(AXIS2_PROPERTY_GET_VALUE(property, env));
         if(msg_num_lng <= 0)
@@ -702,16 +710,14 @@
         sandesha2_seq_t *seq = NULL;
         axis2_char_t *req_seq_id = NULL;
         sandesha2_seq_property_bean_t *spec_ver_bean = NULL;
-        axis2_op_ctx_t *op_ctx = NULL;
-        axis2_ctx_t *ctx = NULL;
-        axis2_property_t *property = NULL;
+        sandesha2_msg_ctx_t *req_rm_msg_ctx = NULL;
 
         incoming_seq_id = sandesha2_utils_get_svr_side_incoming_seq_id(env, 
                         internal_seq_id);
         incoming_to_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(
                         seq_prop_mgr, env, incoming_seq_id, 
                         SANDESHA2_SEQ_PROP_TO_EPR);
-        if(NULL != incoming_to_bean)
+        if(incoming_to_bean)
         {
             axis2_char_t *incoming_to = NULL;
             axis2_char_t *value = NULL;
@@ -725,18 +731,15 @@
                         property, AXIS2_FALSE);
         }
        
-        op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
-        ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
-        property = AXIS2_CTX_GET_PROPERTY(ctx, env, 
-            SANDESHA2_WSRM_COMMON_SEQ, AXIS2_FALSE);
-        seq = (sandesha2_seq_t *)  AXIS2_PROPERTY_GET_VALUE(property, 
-                env);
+        req_rm_msg_ctx = sandesha2_msg_init_init_msg(env, req_msg_ctx);
+        seq = (sandesha2_seq_t *) SANDESHA2_MSG_CTX_GET_MSG_PART(
+                req_rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ);
         
         req_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
                         SANDESHA2_SEQ_GET_IDENTIFIER(seq, env), env);
         spec_ver_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
                         env, req_seq_id, SANDESHA2_SEQ_PROP_RM_SPEC_VERSION);
-        if(NULL == spec_ver_bean)
+        if(!spec_ver_bean)
         {
             AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_SPEC_VERSION,
                         AXIS2_FAILURE);
@@ -748,19 +751,19 @@
     {
         property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, 
                         SANDESHA2_CLIENT_RM_SPEC_VERSION, AXIS2_FALSE);
-        if(NULL != property)
+        if(property)
             spec_ver = AXIS2_PROPERTY_GET_VALUE(property, env);
     }
-    if(NULL == spec_ver)
+    if(!spec_ver)
         spec_ver = sandesha2_spec_specific_consts_get_default_spec_version(env);
     if(1 == msg_number)
     {
-        if(NULL == out_seq_bean)
+        if(!out_seq_bean)
             send_create_seq = AXIS2_TRUE;
         sandesha2_seq_mgr_setup_new_client_seq(env, msg_ctx, 
                         internal_seq_id, spec_ver, storage_mgr);
     }
-    if(AXIS2_TRUE == send_create_seq)
+    if(send_create_seq)
     {
         sandesha2_seq_property_bean_t *res_create_seq_added = NULL;
         axis2_char_t *addr_ns_uri = NULL;
@@ -773,7 +776,7 @@
                         SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE, 
                         storage_mgr);
         anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri);
-        if(NULL == res_create_seq_added)
+        if(!res_create_seq_added)
         {
             axis2_char_t *acks_to = NULL;
             
@@ -783,32 +786,25 @@
                         SANDESHA2_VALUE_TRUE);
             SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, 
                         res_create_seq_added);
-            if(NULL != AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx, env))
+            if(AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx, env))
             {
                 property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, 
                         SANDESHA2_CLIENT_ACKS_TO, AXIS2_FALSE);
                 if(NULL != property)
                     acks_to = AXIS2_PROPERTY_GET_VALUE(property, env);
             }
-            if(AXIS2_TRUE == is_svr_side)
+            if(is_svr_side)
             {
-                axis2_op_ctx_t *op_ctx = NULL;
-                axis2_ctx_t *ctx = NULL;
-                axis2_property_t *property = NULL;
                 axis2_endpoint_ref_t *acks_to_epr = NULL;
 
-                op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
-                ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
-                property = AXIS2_CTX_GET_PROPERTY(ctx, env, 
-                        SANDESHA2_SEQ_PROP_REPLY_TO_EPR,AXIS2_FALSE);
-                acks_to_epr = AXIS2_PROPERTY_GET_VALUE(property, env);
+                acks_to_epr = AXIS2_MSG_CTX_GET_TO(req_msg_ctx, env);
                 acks_to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
                         acks_to_epr, env);
             }
-            else if(NULL == acks_to)
+            else if(!acks_to)
                 acks_to = anon_uri;
             
-            if(NULL == acks_to && is_svr_side)
+            if(!acks_to && is_svr_side)
             {
                 axis2_char_t *incoming_seq_id = NULL;
                 sandesha2_seq_property_bean_t *reply_to_epr_bean = NULL;
@@ -853,11 +849,9 @@
         /* let the request end with 202 if a ack has not been
          * written in the incoming thread
          */
-        axis2_op_ctx_t *op_ctx = NULL;
         axis2_ctx_t *ctx = NULL;
         axis2_char_t *written = NULL;
         
-        op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
         ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
         property = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_ACK_WRITTEN, 
                 AXIS2_FALSE);
@@ -865,9 +859,7 @@
             written = AXIS2_PROPERTY_GET_VALUE(property, env);
         if(NULL == written || 0 != AXIS2_STRCMP(written, SANDESHA2_VALUE_TRUE))
         {
-            axis2_op_ctx_t *op_ctx = NULL;
             axis2_ctx_t *ctx = NULL;
-            op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
             if (NULL != op_ctx)
             {
                 ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
@@ -1182,7 +1174,10 @@
         req_msg = AXIS2_OP_CTX_GET_MSG_CTX(AXIS2_MSG_CTX_GET_OP_CTX(app_msg_ctx, env), 
                         env, AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
         if(req_msg)
+        {
+            printf("******************************found req_msg********************************\n");
             reply_to = AXIS2_MSG_CTX_GET_REPLY_TO(req_msg, env);
+        }
         if(reply_to)
             new_to_str = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
                         reply_to, env);

Modified: webservices/sandesha/trunk/c/src/util/fault_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/fault_mgr.c?view=diff&rev=470274&r1=470273&r2=470274
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_mgr.c Thu Nov  2 00:33:52 2006
@@ -296,11 +296,11 @@
 
 sandesha2_msg_ctx_t* AXIS2_CALL 
 sandesha2_fault_mgr_check_for_unknown_seq
-            (sandesha2_fault_mgr_t *fault_mgr,
-            const axis2_env_t *env,
-            sandesha2_msg_ctx_t *rm_msg_ctx,
-            axis2_char_t *seq_id,
-            sandesha2_storage_mgr_t *storage_man)
+    (sandesha2_fault_mgr_t *fault_mgr,
+    const axis2_env_t *env,
+    sandesha2_msg_ctx_t *rm_msg_ctx,
+    axis2_char_t *seq_id,
+    sandesha2_storage_mgr_t *storage_man)
 {
     sandesha2_create_seq_mgr_t *create_seq_mgr = NULL;
     int type = -1;
@@ -319,6 +319,7 @@
         SANDESHA2_MSG_TYPE_TERMINATE_SEQ_RESPONSE == type ||
         SANDESHA2_MSG_TYPE_CLOSE_SEQ_RESPONSE == type)
     {
+        AXIS2_LOG_INFO(env->log, "[sandesha2] came10 .........");
         sandesha2_create_seq_bean_t *find_bean = NULL;
         axis2_array_list_t *list = NULL;
         
@@ -326,7 +327,7 @@
         SANDESHA2_CREATE_SEQ_BEAN_SET_SEQ_ID(find_bean, env, seq_id);
         list = SANDESHA2_CREATE_SEQ_MGR_FIND(create_seq_mgr, env, 
                         find_bean);
-        if(NULL != list)
+        if(list)
         {
             if(0 == AXIS2_ARRAY_LIST_SIZE(list, env))
                 valid_seq = AXIS2_FALSE;
@@ -343,11 +344,14 @@
         next_msg_mgr = SANDESHA2_STORAGE_MGR_GET_NEXT_MSG_MGR(
                         storage_man, env);
         list = SANDESHA2_NEXT_MSG_MGR_RETRIEVE_ALL(next_msg_mgr, env);
-        if(NULL != list)
+        if(list)
         {
+            int size = AXIS2_ARRAY_LIST_SIZE(list, env);
+            AXIS2_LOG_INFO(env->log, "[sandesha2] size:%d ", size);
             int i = 0;
-            for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(list, env); i++)
+            for(i = 0; i < size; i++)
             {
+                AXIS2_LOG_INFO(env->log, "[sandesha2] came12 .........");
                 sandesha2_next_msg_bean_t *next_bean = NULL;
                 axis2_char_t *tmp_id = NULL;
                 
@@ -365,7 +369,7 @@
         else
             valid_seq = AXIS2_FALSE;
     }
-    if(AXIS2_FALSE == valid_seq)
+    if(!valid_seq)
     {
         sandesha2_fault_data_t *fault_data = NULL;
         axis2_char_t *rm_ns_val = NULL;

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?view=diff&rev=470274&r1=470273&r2=470274
==============================================================================
--- webservices/sandesha/trunk/c/src/util/seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/seq_mgr.c Thu Nov  2 00:33:52 2006
@@ -53,9 +53,9 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 sandesha2_seq_mgr_setup_new_seq(
-        const axis2_env_t *env,
-        sandesha2_msg_ctx_t *create_seq_msg, 
-        sandesha2_storage_mgr_t *storage_mgr)
+    const axis2_env_t *env,
+    sandesha2_msg_ctx_t *create_seq_msg, 
+    sandesha2_storage_mgr_t *storage_mgr)
 {
     axis2_char_t *seq_id = NULL;
     axis2_endpoint_ref_t *to = NULL;
@@ -150,7 +150,9 @@
     next_msg_mgr = SANDESHA2_STORAGE_MGR_GET_NEXT_MSG_MGR(storage_mgr, env);
     next_msg_bean = sandesha2_next_msg_bean_create_with_data(env, seq_id, 1); 
                                                     /* 1 will be the next */
+    AXIS2_LOG_INFO(env->log, "[sandesha2] came1");
     SANDESHA2_NEXT_MSG_MGR_INSERT(next_msg_mgr, env, next_msg_bean);
+    AXIS2_LOG_INFO(env->log, "[sandesha2] came2");
 
     /* Message to invoke. This will apply for only in-order invocations */
     sandesha2_utils_start_sender_for_seq(env, conf_ctx, seq_id);

Modified: webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/in_order_invoker.c?view=diff&rev=470274&r1=470273&r2=470274
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/in_order_invoker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/in_order_invoker.c Thu Nov  2 00:33:52 2006
@@ -275,11 +275,13 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     invoker_impl = SANDESHA2_INTF_TO_IMPL(invoker);
+    AXIS2_LOG_INFO(env->log, "came10*************************");
    
     args = AXIS2_MALLOC(env->allocator, sizeof(
                         sandesha2_in_order_invoker_args_t)); 
     args->impl = invoker_impl;
     args->env = (axis2_env_t*)env;
+    AXIS2_LOG_INFO(env->log, "came11*************************");
     worker_thread = AXIS2_THREAD_POOL_GET_THREAD(env->thread_pool,
                         sandesha2_in_order_invoker_worker_func, (void*)args);
     if(NULL == worker_thread)
@@ -350,6 +352,7 @@
         int i = 0;
 
         AXIS2_SLEEP(1);
+        AXIS2_LOG_INFO(env->log, "came20*************************");
         storage_mgr = sandesha2_utils_get_storage_mgr(env, 
                         invoker_impl->conf_ctx, 
                         AXIS2_CONF_CTX_GET_CONF(invoker_impl->conf_ctx, env));
@@ -373,6 +376,7 @@
             
         for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(all_seq_list, env); i++)
         {
+            AXIS2_LOG_INFO(env->log, "came21*************************");
             axis2_char_t *seq_id = NULL;
             long next_msg_no = -1;
             sandesha2_next_msg_bean_t *next_msg_bean = NULL;



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org


Mime
View raw message