mirror of https://github.com/apache/activemq.git
Applied patch for https://issues.apache.org/activemq/browse/AMQ-1629
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@646268 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
5c7374bfae
commit
4ba4853402
|
@ -785,6 +785,13 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge {
|
||||||
if (dests != null && dests.length > 0) {
|
if (dests != null && dests.length > 0) {
|
||||||
for (int i = 0; i < dests.length; i++) {
|
for (int i = 0; i < dests.length; i++) {
|
||||||
ActiveMQDestination match = dests[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)) {
|
if (match != null && filter.matches(match)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -794,6 +801,13 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge {
|
||||||
if (dests != null && dests.length > 0) {
|
if (dests != null && dests.length > 0) {
|
||||||
for (int i = 0; i < dests.length; i++) {
|
for (int i = 0; i < dests.length; i++) {
|
||||||
ActiveMQDestination match = dests[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)) {
|
if (match != null && filter.matches(match)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue