svn commit: r689502 - in /webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors: app_msg_processor.c make_connection_msg_processor.c

Author: damitha
Date: Wed Aug 27 08:36:23 2008
New Revision: 689502

URL: http://svn.apache.org/viewvc?rev=689502&view=rev
Log:
Working interoperablity

Modified:
    webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c
    webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/make_connection_msg_processor.c

Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c?rev=689502&r1=689501&r2=689502&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c Wed Aug 27 08:36:23 2008
@@ -1924,10 +1924,6 @@
         }
 
         sandesha2_sender_bean_set_msg_ctx_ref_key(ack_bean, env, key);
-        /* We don't store the acknowledgment in memory. To indicate that it should be stored only in the
-         * database we pass AXIS2_FALSE as last argument. This measure is taken to avoid memory corruption.
-         */
-        sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, key, ack_msg_ctx, AXIS2_FALSE);
         send_time = sandesha2_utils_get_current_time_in_millis(env);
         sandesha2_sender_bean_set_time_to_send(ack_bean, env, send_time);
         sandesha2_sender_bean_set_msg_id(ack_bean, env, sandesha2_msg_ctx_get_msg_id(ack_rm_msg_ctx, env));
@@ -1992,6 +1988,11 @@
         }
     }
 
+    /* We don't store the acknowledgment in memory. To indicate that it should be stored only in the
+     * database we pass AXIS2_FALSE as last argument. This measure is taken to avoid memory corruption.
+     */
+    sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, key, ack_msg_ctx, AXIS2_FALSE);
+
     if(ack_rm_msg_ctx)
     {
         sandesha2_msg_ctx_free(ack_rm_msg_ctx, env);

Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/make_connection_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/make_connection_msg_processor.c?rev=689502&r1=689501&r2=689502&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/make_connection_msg_processor.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/make_connection_msg_processor.c Wed Aug 27 08:36:23 2008
@@ -592,7 +592,7 @@
     axis2_char_t *dbname)
 {
     int i = 0;
-    int index = 0;
+    int index = -1;
     int match_list_size = 0;
     axutil_array_list_t *match_list = NULL;
     axis2_char_t sql_find[1024];
@@ -637,6 +637,16 @@
         msg_type = sandesha2_sender_bean_get_msg_type(bean, env);
         AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2]msg_type:%d", 
             msg_type);
+
+        if(msg_type == SANDESHA2_MSG_TYPE_ACK)
+        {
+            /* For the time being we do not send acknowledgement messages in the make connection 
+             * back channel 
+             */
+            AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] ack msg type is still not supported");
+            continue;
+        }
+
         if(msg_type == SANDESHA2_MSG_TYPE_APPLICATION)
         {
             long msg_no = sandesha2_sender_bean_get_msg_no(bean, env);