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

additional fix for https://issues.apache.org/activemq/browse/AMQ-2086 and a couple of improvements for network tests 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@738421 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2009-01-28 09:50:31 +00:00
parent 39dd6b914a
commit 2bda17a6b0
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
activemq-core/pom.xml
View File

@ -388,9 +388,6 @@
<!-- These are load tests so take too long to run --> <!-- These are load tests so take too long to run -->
<exclude>**/load/*</exclude> <exclude>**/load/*</exclude>
<!-- http://jira.activemq.org/jira/browse/AMQ-594 -->
<exclude>**/SimpleNetworkTest.*</exclude>
<!-- http://jira.activemq.org/jira/browse/AMQ-610 --> <!-- http://jira.activemq.org/jira/browse/AMQ-610 -->
<exclude>**/FanoutTransportBrokerTest.*</exclude> <exclude>**/FanoutTransportBrokerTest.*</exclude>

18
activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
View File

@ -441,7 +441,7 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br
if (AdvisorySupport.isConsumerAdvisoryTopic(message.getDestination())) { if (AdvisorySupport.isConsumerAdvisoryTopic(message.getDestination())) {
serviceRemoteConsumerAdvisory(message.getDataStructure()); serviceRemoteConsumerAdvisory(message.getDataStructure());
} else { } else {
if (!isPermissableDestination(message.getDestination())) { if (!isPermissableDestination(message.getDestination(), true)) {
return; return;
} }
if (message.isResponseRequired()) { if (message.isResponseRequired()) {
@ -853,12 +853,20 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br
rc[brokerPath.length] = idToAppend; rc[brokerPath.length] = idToAppend;
return rc; return rc;
} }
protected boolean isPermissableDestination(ActiveMQDestination destination) { protected boolean isPermissableDestination(ActiveMQDestination destination) {
return isPermissableDestination(destination, false);
}
protected boolean isPermissableDestination(ActiveMQDestination destination, boolean allowTemporary) {
// Are we not bridging temp destinations? // Are we not bridging temp destinations?
if (destination.isTemporary() && !configuration.isBridgeTempDestinations()) { if (destination.isTemporary()) {
return false; if (allowTemporary) {
} return true;
} else {
return configuration.isBridgeTempDestinations();
}
}
DestinationFilter filter = DestinationFilter.parseFilter(destination); DestinationFilter filter = DestinationFilter.parseFilter(destination);
ActiveMQDestination[] dests = excludedDestinations; ActiveMQDestination[] dests = excludedDestinations;

2
activemq-core/src/test/resources/org/apache/activemq/network/duplexLocalBroker.xml
View File

@ -18,7 +18,7 @@
<beans> <beans>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker brokerName="localBroker" persistent="true" useShutdownHook="false" xmlns="http://activemq.apache.org/schema/core"> <broker brokerName="localBroker" persistent="false" useShutdownHook="false" xmlns="http://activemq.apache.org/schema/core">
<transportConnectors> <transportConnectors>
<transportConnector uri="tcp://localhost:61616"/> <transportConnector uri="tcp://localhost:61616"/>
</transportConnectors> </transportConnectors>

2
activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml
View File

@ -18,7 +18,7 @@
<beans> <beans>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker brokerName="remoteBroker" persistent="true" useShutdownHook="false" monitorConnectionSplits="true" xmlns="http://activemq.apache.org/schema/core"> <broker brokerName="remoteBroker" useJmx="false" persistent="false" useShutdownHook="false" monitorConnectionSplits="true" xmlns="http://activemq.apache.org/schema/core">
<transportConnectors> <transportConnectors>
<transportConnector uri="tcp://localhost:61617"/> <transportConnector uri="tcp://localhost:61617"/>
</transportConnectors> </transportConnectors>