svn commit: r646268 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java

[rajdavies]

Author: rajdavies
Date: Wed Apr  9 04:10:54 2008
New Revision: 646268

URL: http://svn.apache.org/viewvc?rev=646268&view=rev
Log:
Applied patch for https://issues.apache.org/activemq/browse/AMQ-1629

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=646268&r1=646267&r2=646268&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
 Wed Apr  9 04:10:54 2008
@@ -785,6 +785,13 @@
         if (dests != null && dests.length > 0) {
             for (int i = 0; i < dests.length; i++) {
                 ActiveMQDestination match = dests[i];
+                if (filter instanceof 
org.apache.activemq.filter.SimpleDestinationFilter) {
+                    DestinationFilter newFilter = 
DestinationFilter.parseFilter(match);
+                    if (!(newFilter instanceof 
org.apache.activemq.filter.SimpleDestinationFilter)) {
+                        filter = newFilter;
+                        match = destination;
+                    }
+                }
                 if (match != null && filter.matches(match)) {
                     return false;
                 }
@@ -794,6 +801,13 @@
         if (dests != null && dests.length > 0) {
             for (int i = 0; i < dests.length; i++) {
                 ActiveMQDestination match = dests[i];
+                if (filter instanceof 
org.apache.activemq.filter.SimpleDestinationFilter) {
+                    DestinationFilter newFilter = 
DestinationFilter.parseFilter(match);
+                    if (!(newFilter instanceof 
org.apache.activemq.filter.SimpleDestinationFilter)) {
+                        filter = newFilter;
+                        match = destination;
+                    }
+                }
                 if (match != null && filter.matches(match)) {
                     return true;
                 }