svn commit: r410279 - /incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java

[chirino]

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