Author: rajdavies
Date: Sun Dec 16 12:40:50 2007
New Revision: 604700

URL: http://svn.apache.org/viewvc?rev=604700&view=rev
Log:
Fix for https://issues.apache.org/activemq/browse/AMQ-1521

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java?rev=604700&r1=604699&r2=604700&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java Sun Dec 16 12:40:50 2007
@@ -394,7 +394,7 @@
                     ConnectionError ce = (ConnectionError)command;
                     serviceRemoteException(ce.getException());
                 } else {
-                    if (configuration.isDuplex() || createdByDuplex) {
+                    if (isDuplex()) {
                         if (command.isMessage()) {
                             ActiveMQMessage message = (ActiveMQMessage)command;
                             if (AdvisorySupport.isConsumerAdvisoryTopic(message.getDestination())) {
@@ -569,7 +569,7 @@
                             LOG.trace("bridging " + configuration.getBrokerName() + " -> " + remoteBrokerName + ": " + message);
                         }
 
-                        if (!message.isResponseRequired()) {
+                        if (!message.isResponseRequired() || isDuplex()) {
 
                             // If the message was originally sent using async
                             // send, we will preserve that QOS
@@ -932,6 +932,10 @@
 
     public long getEnqueueCounter() {
         return enqueueCounter.get();
+    }
+    
+    protected boolean isDuplex() {
+        return configuration.isDuplex() || createdByDuplex;
     }
 
 }