svn commit: r698491 - in /webservices/sandesha/trunk/c/src: handlers/sandesha2_in_handler.c msgprocessors/app_msg_processor.c msgprocessors/terminate_seq_msg_processor.c

Author: damitha
Date: Wed Sep 24 02:50:33 2008
New Revision: 698491

URL: http://svn.apache.org/viewvc?rev=698491&view=rev
Log:
Making interoperability with WCF

Modified:
    webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
    webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
    webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c

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=698491&r1=698490&r2=698491&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c Wed Sep 24 02:50:33 2008
@@ -411,8 +411,10 @@
                     
                     AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, 
                             "[sandesha2] Empty body last msg recieved");
+                    
+                    sandesha2_msg_ctx_set_wsa_action(rm_msg_ctx, env, 
+                            SANDESHA2_SPEC_2005_02_SOAP_ACTION_LAST_MESSAGE);
 
-                    drop = AXIS2_TRUE;
                     if(!rcvd_msgs_bean)
                     {
                         rcvd_msgs_bean = sandesha2_seq_property_bean_create_with_data(env, 
@@ -433,10 +435,13 @@
                     
                     sandesha2_seq_property_bean_set_value(rcvd_msgs_bean, env, bean_value);
                     sandesha2_seq_property_mgr_update(seq_prop_mgr, env, rcvd_msgs_bean);
-                    app_msg_processor = sandesha2_app_msg_processor_create(env);
-                    sandesha2_app_msg_processor_send_ack_if_reqd(env, rm_msg_ctx, bean_value, 
+                    if(drop)
+                    {
+                        app_msg_processor = sandesha2_app_msg_processor_create(env);
+                        sandesha2_app_msg_processor_send_ack_if_reqd(env, rm_msg_ctx, bean_value, 
                             rmd_sequence_id, storage_mgr, sender_mgr, seq_prop_mgr);
-                    sandesha2_msg_processor_free(app_msg_processor, env);
+                        sandesha2_msg_processor_free(app_msg_processor, env);
+                    }
                 }
             }
 

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=698491&r1=698490&r2=698491&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Wed Sep 24 02:50:33 2008
@@ -848,6 +848,8 @@
                 {
                     AXIS2_FREE(env->allocator, msgs_str);
                 }
+                
+                AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Creating out message context failed");
 
                 return AXIS2_FAILURE;
             }
@@ -872,7 +874,8 @@
                 {
                     AXIS2_FREE(env->allocator, msgs_str);
                 }
-
+                
+                AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Creating qname failed");
                 return AXIS2_FAILURE;
             }
         
@@ -885,6 +888,9 @@
             axis2_msg_ctx_set_op_ctx(out_msg_ctx, env, op_ctx);
 
             storage_key = axutil_uuid_gen(env);
+            AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, 
+                    "[sandesha2] Sending response to the empty body last message");
+
             status = sandesha2_app_msg_processor_send_app_msg(env, out_rm_msg_ctx, outgoing_int_seq_id, 
                 msg_no, storage_key, storage_mgr, create_seq_mgr, seq_prop_mgr, sender_mgr);
 

Modified: webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c?rev=698491&r1=698490&r2=698491&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Wed Sep 24 02:50:33 2008
@@ -539,7 +539,8 @@
         
     AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] highest_out_msg_num:%d", highest_out_msg_num);
 
-    if(add_rec_side_term && highest_out_msg_num > 0 && rec_side_int_seq_id && out_seq_id)
+    /*if(add_rec_side_term && highest_out_msg_num > 0 && rec_side_int_seq_id && out_seq_id)*/
+    if(highest_out_msg_num > 0 && rec_side_int_seq_id && out_seq_id)
     {
         axis2_bool_t all_acked = AXIS2_FALSE;