You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/04/02 15:51:06 UTC
[1/2] qpid-broker-j git commit: NO-JIRA: [Broker-J] [System Tests]
Remove workaround for qpid jms client not respecting reconnectDelay
(QPIDJMS-365)
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 <or...@apache.org>
Authored: Mon Apr 2 16:48:54 2018 +0100
Committer: Alex Rudyy <or...@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-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-broker-j git commit: NO-JIRA: [Broker-J] Bump Qpid JMS
client version to 0.31.0
Posted by or...@apache.org.
NO-JIRA: [Broker-J] Bump Qpid JMS client version to 0.31.0
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/0cc2bb7d
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/0cc2bb7d
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/0cc2bb7d
Branch: refs/heads/master
Commit: 0cc2bb7de79a82f3b138277a4b5a00c9749af948
Parents: d773df7
Author: Alex Rudyy <or...@apache.org>
Authored: Mon Apr 2 16:04:02 2018 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Mon Apr 2 16:51:00 2018 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/0cc2bb7d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index acb1f6e..afebdb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,7 +149,7 @@
<maven-core-version>3.5.0</maven-core-version>
<maven-resolver-version>1.0.3</maven-resolver-version>
<httpclient-version>4.5.3</httpclient-version>
- <qpid-jms-client-version>0.30.0</qpid-jms-client-version>
+ <qpid-jms-client-version>0.31.0</qpid-jms-client-version>
<qpid-jms-client-amqp-0-x-version>6.3.0</qpid-jms-client-amqp-0-x-version>
<exec-maven-plugin-version>1.3.2</exec-maven-plugin-version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org