From 4557f713f5607a16c4800de520f7e8d5aa546ced Mon Sep 17 00:00:00 2001 From: Erich Duda Date: Fri, 19 Feb 2016 14:13:59 +0100 Subject: [PATCH] ARTEMIS-414 - [Artemis Testsuite] TemporaryQueueClusterTest#testClusteredQueue fails --- .../integration/jms/cluster/LargeMessageOverBridgeTest.java | 3 --- .../activemq/artemis/tests/util/JMSClusteredTestBase.java | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java index 51d3db35bf..e2adebbc3a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java @@ -22,7 +22,6 @@ import org.apache.activemq.artemis.api.jms.JMSFactoryType; import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; -import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; import org.apache.activemq.artemis.tests.util.JMSClusteredTestBase; import org.junit.Test; @@ -169,8 +168,6 @@ public class LargeMessageOverBridgeTest extends JMSClusteredTestBase { protected Configuration createConfigServer(final int source, final int destination) throws Exception { Configuration config = super.createConfigServer(source, destination); - config.getAddressesSettings().put("#", new AddressSettings().setRedistributionDelay(0)); - installHack(config); return config; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java index ed326cb1aa..6dc148da9d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java @@ -26,6 +26,7 @@ import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.jms.server.config.impl.JMSConfigurationImpl; import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; @@ -174,6 +175,8 @@ public class JMSClusteredTestBase extends ActiveMQTestBase { } })); + configuration.getAddressesSettings().put("#", new AddressSettings().setRedistributionDelay(0)); + return configuration; }