You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/05/12 19:52:06 UTC

svn commit: r405806 - /incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java

Author: chirino
Date: Fri May 12 10:52:04 2006
New Revision: 405806

URL: http://svn.apache.org/viewcvs?rev=405806&view=rev
Log:
Honnor the QoS requested by the client when replicating to the slave broker.

Modified:
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java?rev=405806&r1=405805&r2=405806&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java Fri May 12 10:52:04 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);