Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged in change 405806 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/branches/activemq-4.0@410279 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2006-05-30 13:43:24 +00:00
parent e162e9a808
commit da46dac7bc
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java
View File

@ -328,7 +328,7 @@ public class MasterBroker extends InsertableMutableBrokerFilter{
protected void sendToSlave(Message message){ protected void sendToSlave(Message message){
if (message.isPersistent() && !message.isInTransaction()){ if ( message.isResponseRequired() ){
sendSyncToSlave(message); sendSyncToSlave(message);
}else{ }else{
sendAsyncToSlave(message); sendAsyncToSlave(message);
@ -338,8 +338,7 @@ public class MasterBroker extends InsertableMutableBrokerFilter{
} }
protected void sendToSlave(MessageAck ack){ protected void sendToSlave(MessageAck ack){
if ( ack.isResponseRequired() ){
if (ack.isInTransaction()){
sendAsyncToSlave(ack); sendAsyncToSlave(ack);
}else{ }else{
sendSyncToSlave(ack); sendSyncToSlave(ack);