Author: dejanb
Date: Wed Jan 28 09:50:31 2009
New Revision: 738421
URL: http://svn.apache.org/viewvc?rev=738421&view=rev
Log:
additional fix for https://issues.apache.org/activemq/browse/AMQ-2086 and a
couple of improvements for network tests
Modified:
activemq/trunk/activemq-core/pom.xml
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/duplexLocalBroker.xml
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml
Modified: activemq/trunk/activemq-core/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=738421&r1=738420&r2=738421&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Wed Jan 28 09:50:31 2009
@@ -388,9 +388,6 @@
<!-- These are load tests so take too long to run -->
<exclude>**/load/*</exclude>
- <!-- http://jira.activemq.org/jira/browse/AMQ-594 -->
- <exclude>**/SimpleNetworkTest.*</exclude>
-
<!-- http://jira.activemq.org/jira/browse/AMQ-610 -->
<exclude>**/FanoutTransportBrokerTest.*</exclude>
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=738421&r1=738420&r2=738421&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 Jan 28 09:50:31 2009
@@ -441,7 +441,7 @@
if
(AdvisorySupport.isConsumerAdvisoryTopic(message.getDestination())) {
serviceRemoteConsumerAdvisory(message.getDataStructure());
} else {
- if
(!isPermissableDestination(message.getDestination())) {
+ if
(!isPermissableDestination(message.getDestination(), true)) {
return;
}
if (message.isResponseRequired()) {
@@ -853,12 +853,20 @@
rc[brokerPath.length] = idToAppend;
return rc;
}
-
+
protected boolean isPermissableDestination(ActiveMQDestination
destination) {
+ return isPermissableDestination(destination, false);
+ }
+
+ protected boolean isPermissableDestination(ActiveMQDestination
destination, boolean allowTemporary) {
// Are we not bridging temp destinations?
- if (destination.isTemporary() &&
!configuration.isBridgeTempDestinations()) {
- return false;
- }
+ if (destination.isTemporary()) {
+ if (allowTemporary) {
+ return true;
+ } else {
+ return configuration.isBridgeTempDestinations();
+ }
+ }
DestinationFilter filter = DestinationFilter.parseFilter(destination);
ActiveMQDestination[] dests = excludedDestinations;
Modified:
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/duplexLocalBroker.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/duplexLocalBroker.xml?rev=738421&r1=738420&r2=738421&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/duplexLocalBroker.xml
(original)
+++
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/duplexLocalBroker.xml
Wed Jan 28 09:50:31 2009
@@ -18,7 +18,7 @@
<beans>
<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>
<transportConnector uri="tcp://localhost:61616"/>
</transportConnectors>
Modified:
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml?rev=738421&r1=738420&r2=738421&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml
(original)
+++
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml
Wed Jan 28 09:50:31 2009
@@ -18,7 +18,7 @@
<beans>
<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>
<transportConnector uri="tcp://localhost:61617"/>
</transportConnectors>
