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;
}