You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/07/17 13:00:30 UTC
activemq-artemis git commit: ARTEMIS-1966 Replication channel closed
but not connection if flow controlled during replication
Repository: activemq-artemis
Updated Branches:
refs/heads/2.6.x b703ca315 -> e4ccbb929
ARTEMIS-1966 Replication channel closed but not connection if flow controlled during replication
(cherry picked from commit 9f8288c0156072b3ae02efd04e1adbcd0abca2c2)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e4ccbb92
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e4ccbb92
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e4ccbb92
Branch: refs/heads/2.6.x
Commit: e4ccbb929b722a31af2d14f17e4c96d6bbe2b10e
Parents: b703ca3
Author: yang wei <wy...@gmail.com>
Authored: Thu Jul 5 17:48:11 2018 +0800
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Jul 17 08:59:48 2018 -0400
----------------------------------------------------------------------
.../replication/SharedNothingReplicationFlowControlTest.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e4ccbb92/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/SharedNothingReplicationFlowControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/SharedNothingReplicationFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/SharedNothingReplicationFlowControlTest.java
index 923ce3a..981b355 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/SharedNothingReplicationFlowControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/SharedNothingReplicationFlowControlTest.java
@@ -55,7 +55,6 @@ import org.apache.activemq.artemis.junit.Wait;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.jboss.logging.Logger;
-import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
@@ -86,7 +85,7 @@ public class SharedNothingReplicationFlowControlTest extends ActiveMQTestBase {
public void testReplicationIfFlowControlled() throws Exception {
// start live
Configuration liveConfiguration = createLiveConfiguration();
- ActiveMQServer liveServer = addServer(ActiveMQServers.newActiveMQServer(liveConfiguration));
+ ActiveMQServer liveServer = ActiveMQServers.newActiveMQServer(liveConfiguration);
liveServer.start();
Wait.waitFor(() -> liveServer.isStarted());
@@ -99,7 +98,7 @@ public class SharedNothingReplicationFlowControlTest extends ActiveMQTestBase {
ClientSession sess = csf.createSession();
sess.createQueue("flowcontrol", RoutingType.ANYCAST, "flowcontrol", true);
sess.close();
-
+ Executor sendMessageExecutor = Executors.newCachedThreadPool();
int i = 0;
final int j = 100;
@@ -107,7 +106,7 @@ public class SharedNothingReplicationFlowControlTest extends ActiveMQTestBase {
// start backup
Configuration backupConfiguration = createBackupConfiguration();
- ActiveMQServer backupServer = addServer(ActiveMQServers.newActiveMQServer(backupConfiguration));
+ ActiveMQServer backupServer = ActiveMQServers.newActiveMQServer(backupConfiguration);
backupServer.start();
Wait.waitFor(() -> backupServer.isStarted());