Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 45065 invoked from network); 28 Oct 2008 12:08:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 28 Oct 2008 12:08:18 -0000 Received: (qmail 5808 invoked by uid 500); 28 Oct 2008 12:08:23 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 5792 invoked by uid 500); 28 Oct 2008 12:08:23 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 5783 invoked by uid 99); 28 Oct 2008 12:08:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Oct 2008 05:08:23 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Oct 2008 12:07:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C31512388986; Tue, 28 Oct 2008 05:07:27 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r708548 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java Date: Tue, 28 Oct 2008 12:07:27 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081028120727.C31512388986@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gtully Date: Tue Oct 28 05:07:27 2008 New Revision: 708548 URL: http://svn.apache.org/viewvc?rev=708548&view=rev Log: resolve AMQ-1983 Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java?rev=708548&r1=708547&r2=708548&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java Tue Oct 28 05:07:27 2008 @@ -253,7 +253,7 @@ */ public int prepareTransaction(ConnectionContext context, TransactionId xid) throws Exception { TransactionInfo info = new TransactionInfo(context.getConnectionId(), xid, TransactionInfo.PREPARE); - sendAsyncToSlave(info); + sendSyncToSlave(info); int result = super.prepareTransaction(context, xid); return result; }