Repository: qpid-broker-j Updated Branches: refs/heads/master d773df7d7 -> b22a1e7ad
NO-JIRA: [Broker-J] [System Tests] Remove workaround for qpid jms client not respecting reconnectDelay (QPIDJMS-365) Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/b22a1e7a Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/b22a1e7a Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/b22a1e7a Branch: refs/heads/master Commit: b22a1e7ad898992a60ffb8ef2c66f58735d8ba1e Parents: 0cc2bb7 Author: Alex Rudyy <oru...@apache.org> Authored: Mon Apr 2 16:48:54 2018 +0100 Committer: Alex Rudyy <oru...@apache.org> Committed: Mon Apr 2 16:51:00 2018 +0100 ---------------------------------------------------------------------- .../server/store/berkeleydb/replication/GroupCreator.java | 8 -------- .../http/endtoend/message/CompressedMessageContentTest.java | 4 +--- .../apache/qpid/systests/QpidJmsClientConnectionBuilder.java | 4 ++++ 3 files changed, 5 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b22a1e7a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java ---------------------------------------------------------------------- diff --git a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java index 7750a0d..d7e6b7f 100644 --- a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java +++ b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java @@ -306,14 +306,6 @@ public class GroupCreator connectionBuilder.addFailoverPort(brokerPortNumber); } - if (_testcase.getBrokerProtocol().equals(Protocol.AMQP_1_0)) - { - connectionBuilder.setOptions(Collections.singletonMap("failover.warnAfterReconnectAttempts", "1")); - // TODO - QPIDJMS-365 - workaround for the fact that the client does not respect reconnectDelay if the - // server closes the connection gracefully. - connectionBuilder.setOptions(Collections.singletonMap("failover.initialReconnectDelay", "15000")); - } - return connectionBuilder; } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b22a1e7a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/CompressedMessageContentTest.java ---------------------------------------------------------------------- diff --git a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/CompressedMessageContentTest.java b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/CompressedMessageContentTest.java index 62a85c6..00b330c 100644 --- a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/CompressedMessageContentTest.java +++ b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/CompressedMessageContentTest.java @@ -31,7 +31,6 @@ import java.io.IOException; import java.io.InputStream; import java.net.HttpURLConnection; import java.nio.charset.StandardCharsets; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -255,8 +254,7 @@ public class CompressedMessageContentTest extends HttpTestBase private Connection getConnection(final boolean compress) throws Exception { - Map<String, String> options = Collections.singletonMap("compressMessages", String.valueOf(compress)); - return getConnectionBuilder().setOptions(options).build(); + return getConnectionBuilder().setCompress(compress).build(); } } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b22a1e7a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClientConnectionBuilder.java ---------------------------------------------------------------------- diff --git a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClientConnectionBuilder.java b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClientConnectionBuilder.java index 263ff9c..b5be7d2 100644 --- a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClientConnectionBuilder.java +++ b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClientConnectionBuilder.java @@ -286,6 +286,10 @@ public class QpidJmsClientConnectionBuilder implements ConnectionBuilder options.putAll(_options); if (_enableFailover) { + if (!options.containsKey("failover.useReconnectBackOff")) + { + options.put("failover.useReconnectBackOff", "false"); + } if (!options.containsKey("failover.maxReconnectAttempts")) { options.put("failover.maxReconnectAttempts", "2"); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
