Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 26279 invoked from network); 30 May 2006 14:13:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 30 May 2006 14:13:54 -0000 Received: (qmail 13245 invoked by uid 500); 30 May 2006 14:12:01 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 7821 invoked by uid 500); 30 May 2006 14:11:27 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 5772 invoked by uid 99); 30 May 2006 14:11:11 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 May 2006 07:11:11 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 May 2006 06:43:46 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 43F9F1A983A; Tue, 30 May 2006 06:43:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r410279 - /incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java Date: Tue, 30 May 2006 13:43:25 -0000 To: activemq-commits@geronimo.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060530134326.43F9F1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: chirino Date: Tue May 30 06:43:24 2006 New Revision: 410279 URL: http://svn.apache.org/viewvc?rev=410279&view=rev Log: Merged in change 405806 from trunk Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java?rev=410279&r1=410278&r2=410279&view=diff ============================================================================== --- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java (original) +++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java Tue May 30 06:43:24 2006 @@ -328,7 +328,7 @@ protected void sendToSlave(Message message){ - if (message.isPersistent() && !message.isInTransaction()){ + if ( message.isResponseRequired() ){ sendSyncToSlave(message); }else{ sendAsyncToSlave(message); @@ -338,8 +338,7 @@ } protected void sendToSlave(MessageAck ack){ - - if (ack.isInTransaction()){ + if ( ack.isResponseRequired() ){ sendAsyncToSlave(ack); }else{ sendSyncToSlave(ack);