From sandesha-dev-return-3552-apmail-ws-sandesha-dev-archive=ws.apache.org@ws.apache.org Fri Nov 30 01:48:22 2007 Return-Path: Delivered-To: apmail-ws-sandesha-dev-archive@www.apache.org Received: (qmail 71465 invoked from network); 30 Nov 2007 01:48:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Nov 2007 01:48:21 -0000 Received: (qmail 68332 invoked by uid 500); 30 Nov 2007 01:48:09 -0000 Delivered-To: apmail-ws-sandesha-dev-archive@ws.apache.org Received: (qmail 68258 invoked by uid 500); 30 Nov 2007 01:48:09 -0000 Mailing-List: contact sandesha-dev-help@ws.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list sandesha-dev@ws.apache.org Received: (qmail 68247 invoked by uid 500); 30 Nov 2007 01:48:08 -0000 Delivered-To: apmail-ws-sandesha-cvs@ws.apache.org Received: (qmail 68243 invoked by uid 99); 30 Nov 2007 01:48:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Nov 2007 17:48:08 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Nov 2007 01:47:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2D3CF1A9832; Thu, 29 Nov 2007 17:48:00 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r599669 - in /webservices/sandesha/trunk/c: samples/rm_ping_1_0/rm_ping_1_0.c src/msgprocessors/ack_msg_processor.c src/storage/sqlite/permanent_sender_mgr.c Date: Fri, 30 Nov 2007 01:47:59 -0000 To: sandesha-cvs@ws.apache.org From: damitha@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071130014800.2D3CF1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: damitha Date: Thu Nov 29 17:47:56 2007 New Revision: 599669 URL: http://svn.apache.org/viewvc?rev=599669&view=rev Log: There was a problem of if previous sequence is abruptly stopped, the next sequence send duplicate application messages. Fixed this. Modified: webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_1_0.c webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c Modified: webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_1_0.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_1_0.c?rev=599669&r1=599668&r2=599669&view=diff ============================================================================== --- webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_1_0.c (original) +++ webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_1_0.c Thu Nov 29 17:47:56 2007 @@ -99,7 +99,6 @@ client_home = AXIS2_GETENV("AXIS2C_HOME"); if (!client_home) client_home = "../../deploy"; - /* Create service client */ svc_client = axis2_svc_client_create(env, client_home); if (!svc_client) Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c?rev=599669&r1=599668&r2=599669&view=diff ============================================================================== --- webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c (original) +++ webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c Thu Nov 29 17:47:56 2007 @@ -230,6 +230,7 @@ axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_ACK_PROCSSED, property); input_bean = sandesha2_sender_bean_create(env); + sandesha2_sender_bean_set_internal_seq_id(input_bean, env, int_seq_id); sandesha2_sender_bean_set_send(input_bean, env, AXIS2_TRUE); sandesha2_sender_bean_set_resend(input_bean, env, AXIS2_TRUE); retrans_list = sandesha2_sender_mgr_find_by_sender_bean(retrans_mgr, env, @@ -262,6 +263,9 @@ env, retrans_list, j); if(retrans_bean) { + int msg_type = sandesha2_sender_bean_get_msg_type(retrans_bean, env); + AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, + "[sandesha2]Removing the sender bean with type %d", msg_type); sandesha2_sender_mgr_remove(retrans_mgr, env, sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *) retrans_bean, env)); Modified: webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c?rev=599669&r1=599668&r2=599669&view=diff ============================================================================== --- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c (original) +++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c Thu Nov 29 17:47:56 2007 @@ -634,8 +634,6 @@ axutil_array_list_t *match_list = NULL; sandesha2_permanent_sender_mgr_t *sender_mgr_impl = NULL; sandesha2_sender_bean_t *result = NULL; - AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2]Entry:sandesha2_"\ - "permanent_sender_mgr_get_next_msg_to_send"); AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[sandesha2]Entry:sandesha2_"\ "permanent_sender_mgr_get_next_msg_to_send"); sender_mgr_impl = SANDESHA2_INTF_TO_IMPL(sender_mgr); @@ -684,6 +682,8 @@ break; } } + AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[sandesha2]Exit:sandesha2_"\ + "permanent_sender_mgr_get_next_msg_to_send"); return result; } --------------------------------------------------------------------- To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org For additional commands, e-mail: sandesha-dev-help@ws.apache.org