Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 876F4184A2 for ; Mon, 22 Feb 2016 15:54:28 +0000 (UTC) Received: (qmail 61145 invoked by uid 500); 22 Feb 2016 15:38:26 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 61123 invoked by uid 500); 22 Feb 2016 15:38:26 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 61104 invoked by uid 99); 22 Feb 2016 15:38:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Feb 2016 15:38:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2529CE0278; Mon, 22 Feb 2016 15:38:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Mon, 22 Feb 2016 15:38:27 -0000 Message-Id: <969f9d083c3844d58466dc909dee8438@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [03/47] activemq-artemis git commit: ARTEMIS-414 - [Artemis Testsuite] TemporaryQueueClusterTest#testClusteredQueue fails ARTEMIS-414 - [Artemis Testsuite] TemporaryQueueClusterTest#testClusteredQueue fails Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4557f713 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4557f713 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4557f713 Branch: refs/heads/refactor-openwire Commit: 4557f713f5607a16c4800de520f7e8d5aa546ced Parents: 509a5a0 Author: Erich Duda Authored: Fri Feb 19 14:13:59 2016 +0100 Committer: Clebert Suconic Committed: Fri Feb 19 13:32:54 2016 -0500 ---------------------------------------------------------------------- .../tests/integration/jms/cluster/LargeMessageOverBridgeTest.java | 3 --- .../apache/activemq/artemis/tests/util/JMSClusteredTestBase.java | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4557f713/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java ---------------------------------------------------------------------- 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 51d3db3..e2adebb 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; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4557f713/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java ---------------------------------------------------------------------- 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 ed326cb..6dc148d 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; }