You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2016/05/12 15:39:32 UTC
qpid-jms git commit: QPIDJMS-173 Remove legacy undocumented presettle
configuration for forcing presettle of producers and consumers.
Repository: qpid-jms
Updated Branches:
refs/heads/master 895b3a826 -> 9680fab5d
QPIDJMS-173 Remove legacy undocumented presettle configuration for
forcing presettle of producers and consumers.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/9680fab5
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/9680fab5
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/9680fab5
Branch: refs/heads/master
Commit: 9680fab5dc9c3a6876d55e05b27cab4d82439173
Parents: 895b3a8
Author: Timothy Bish <ta...@gmail.com>
Authored: Thu May 12 11:34:47 2016 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Thu May 12 11:34:47 2016 -0400
----------------------------------------------------------------------
.../qpid/jms/provider/amqp/AmqpConnection.java | 14 ----
.../qpid/jms/provider/amqp/AmqpProvider.java | 23 ------
.../qpid/jms/provider/amqp/AmqpSession.java | 4 +-
.../amqp/builders/AmqpConsumerBuilder.java | 2 +-
.../amqp/builders/AmqpProducerBuilder.java | 2 +-
.../PresettledConsumerIntegrationTest.java | 26 -------
.../PresettledProducerIntegrationTest.java | 74 --------------------
.../jms/integration/SessionIntegrationTest.java | 2 +-
.../provider/amqp/AmqpProviderFactoryTest.java | 19 +----
.../jms/provider/amqp/AmqpProviderTest.java | 2 -
.../qpid/jms/bench/ConsumeFromAMQPTest.java | 2 +-
.../qpid/jms/bench/ProduceToAMQPTest.java | 2 +-
.../jms/bench/ProducerAndConsumerBench.java | 2 +-
13 files changed, 8 insertions(+), 166 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9680fab5/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java
index f284c8a..cf4e441 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java
@@ -156,20 +156,6 @@ public class AmqpConnection extends AmqpAbstractResource<JmsConnectionInfo, Conn
}
/**
- * @return true if the provider has been configured for presettle operations.
- */
- public boolean isPresettleConsumers() {
- return provider.isPresettleConsumers();
- }
-
- /**
- * @return true if the provider has been configured for presettle operations.
- */
- public boolean isPresettleProducers() {
- return provider.isPresettleProducers();
- }
-
- /**
* @return true if anonymous producers should be cached or closed on send complete.
*/
public boolean isAnonymousProducerCache() {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9680fab5/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
index 8e25c86..4dc1659 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
@@ -112,8 +112,6 @@ public class AmqpProvider implements Provider, TransportListener , AmqpResourceP
private boolean traceBytes;
private boolean saslLayer = true;
private String[] saslMechanisms;
- private boolean presettleConsumers;
- private boolean presettleProducers;
private long connectTimeout = JmsConnectionInfo.DEFAULT_CONNECT_TIMEOUT;
private long closeTimeout = JmsConnectionInfo.DEFAULT_CLOSE_TIMEOUT;
private int channelMax = DEFAULT_CHANNEL_MAX;
@@ -1091,27 +1089,6 @@ public class AmqpProvider implements Provider, TransportListener , AmqpResourceP
return connection != null ? connection.getResourceInfo().getSendTimeout() : JmsConnectionInfo.DEFAULT_SEND_TIMEOUT;
}
- public void setPresettle(boolean presettle) {
- setPresettleConsumers(presettle);
- setPresettleProducers(presettle);
- }
-
- public boolean isPresettleConsumers() {
- return this.presettleConsumers;
- }
-
- public void setPresettleConsumers(boolean presettle) {
- this.presettleConsumers = presettle;
- }
-
- public boolean isPresettleProducers() {
- return this.presettleProducers;
- }
-
- public void setPresettleProducers(boolean presettle) {
- this.presettleProducers = presettle;
- }
-
@Override
public String toString() {
return "AmqpProvider: " + getRemoteURI().getHost() + ":" + getRemoteURI().getPort();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9680fab5/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSession.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSession.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSession.java
index 2cb885e..ff7f0ee 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSession.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSession.java
@@ -88,9 +88,7 @@ public class AmqpSession extends AmqpAbstractResource<JmsSessionInfo, Session> i
public void createProducer(JmsProducerInfo producerInfo, AsyncResult request) {
if (producerInfo.getDestination() == null && !getConnection().getProperties().isAnonymousRelaySupported()) {
LOG.debug("Creating an AmqpAnonymousFallbackProducer");
-
- AmqpProducer producer = new AmqpAnonymousFallbackProducer(this, producerInfo);
- producer.setPresettle(getConnection().isPresettleProducers());
+ new AmqpAnonymousFallbackProducer(this, producerInfo);
// No producer is created yet so this is always successful.
request.onSuccess();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9680fab5/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpConsumerBuilder.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpConsumerBuilder.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpConsumerBuilder.java
index 89b6d94..3bf8836 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpConsumerBuilder.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpConsumerBuilder.java
@@ -77,7 +77,7 @@ public class AmqpConsumerBuilder extends AmqpResourceBuilder<AmqpConsumer, AmqpS
Receiver receiver = getParent().getEndpoint().receiver(receiverName);
receiver.setSource(source);
receiver.setTarget(target);
- if (resourceInfo.isBrowser() || resourceInfo.isPresettle() || getParent().getConnection().isPresettleConsumers()) {
+ if (resourceInfo.isBrowser() || resourceInfo.isPresettle()) {
receiver.setSenderSettleMode(SenderSettleMode.SETTLED);
} else {
receiver.setSenderSettleMode(SenderSettleMode.UNSETTLED);
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9680fab5/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpProducerBuilder.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpProducerBuilder.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpProducerBuilder.java
index 0e0f3f4..0875c56 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpProducerBuilder.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpProducerBuilder.java
@@ -66,7 +66,7 @@ public class AmqpProducerBuilder extends AmqpResourceBuilder<AmqpProducer, AmqpS
Sender sender = getParent().getEndpoint().sender(senderName);
sender.setSource(source);
sender.setTarget(target);
- if (resourceInfo.isPresettle() || getParent().getConnection().isPresettleProducers()) {
+ if (resourceInfo.isPresettle()) {
sender.setSenderSettleMode(SenderSettleMode.SETTLED);
} else {
sender.setSenderSettleMode(SenderSettleMode.UNSETTLED);
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9680fab5/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/PresettledConsumerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/PresettledConsumerIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/PresettledConsumerIntegrationTest.java
index 469d30b..dad711f 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/PresettledConsumerIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/PresettledConsumerIntegrationTest.java
@@ -48,32 +48,6 @@ public class PresettledConsumerIntegrationTest extends QpidJmsTestCase {
private final IntegrationTestFixture testFixture = new IntegrationTestFixture();
- //----- Test the amqp.presettleConsumers option --------------------------//
-
- @Test(timeout = 20000)
- public void testPresettledConsumersConfigurationAppliedToTopic() throws Exception {
- String presettleConfig = "?amqp.presettleConsumers=true";
- doTestConsumerWithPresettleOptions(presettleConfig, false, true, true, Topic.class);
- }
-
- @Test(timeout = 20000)
- public void testPresettledConsumersConfigurationAppliedToQueue() throws Exception {
- String presettleConfig = "?amqp.presettleConsumers=true";
- doTestConsumerWithPresettleOptions(presettleConfig, false, true, true, Queue.class);
- }
-
- @Test(timeout = 20000)
- public void testPresettledConsumersConfigurationAppliedToTempTopic() throws Exception {
- String presettleConfig = "?amqp.presettleConsumers=true";
- doTestConsumerWithPresettleOptions(presettleConfig, false, true, true, TemporaryTopic.class);
- }
-
- @Test(timeout = 20000)
- public void testPresettledConsumersConfigurationAppliedToTempQueue() throws Exception {
- String presettleConfig = "?amqp.presettleConsumers=true";
- doTestConsumerWithPresettleOptions(presettleConfig, false, true, true, TemporaryQueue.class);
- }
-
//----- Test the jms.presettlePolicy.presettleAll option -----------------//
@Test(timeout = 20000)
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9680fab5/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/PresettledProducerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/PresettledProducerIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/PresettledProducerIntegrationTest.java
index 85a395d..5485857 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/PresettledProducerIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/PresettledProducerIntegrationTest.java
@@ -107,80 +107,6 @@ public class PresettledProducerIntegrationTest extends QpidJmsTestCase {
doTestProducerWithPresettleOptions(presettleConfig, false, true, true, true, TemporaryQueue.class);
}
- //----- Test the amqp.presettleProducers option --------------------------//
-
- @Test(timeout = 20000)
- public void testPresettledProducersConfigurationAppliedToTopic() throws Exception {
- String presettleConfig = "?amqp.presettleProducers=true";
- doTestProducerWithPresettleOptions(presettleConfig, false, false, true, true, Topic.class);
- }
-
- @Test(timeout = 20000)
- public void testPresettledProducersConfigurationAppliedToQueue() throws Exception {
- String presettleConfig = "?amqp.presettleProducers=true";
- doTestProducerWithPresettleOptions(presettleConfig, false, false, true, true, Queue.class);
- }
-
- @Test(timeout = 20000)
- public void testPresettledProducersConfigurationAppliedToTempTopic() throws Exception {
- String presettleConfig = "?amqp.presettleProducers=true";
- doTestProducerWithPresettleOptions(presettleConfig, false, false, true, true, TemporaryTopic.class);
- }
-
- @Test(timeout = 20000)
- public void testPresettledProducersConfigurationAppliedToTempQueue() throws Exception {
- String presettleConfig = "?amqp.presettleProducers=true";
- doTestProducerWithPresettleOptions(presettleConfig, false, false, true, true, TemporaryQueue.class);
- }
-
- @Test(timeout = 20000)
- public void testPresettledProducersConfigurationAppliedAnonymousSendToTopic() throws Exception {
- String presettleConfig = "?amqp.presettleProducers=true";
- doTestProducerWithPresettleOptions(presettleConfig, false, true, true, true, Topic.class);
- }
-
- @Test(timeout = 20000)
- public void testPresettledProducersConfigurationAppliedAnonymousSendToQueue() throws Exception {
- String presettleConfig = "?amqp.presettleProducers=true";
- doTestProducerWithPresettleOptions(presettleConfig, false, true, true, true, Queue.class);
- }
-
- @Test(timeout = 20000)
- public void testPresettledProducersConfigurationAppliedAnonymousSendToTempTopic() throws Exception {
- String presettleConfig = "?amqp.presettleProducers=true";
- doTestProducerWithPresettleOptions(presettleConfig, false, true, true, true, TemporaryTopic.class);
- }
-
- @Test(timeout = 20000)
- public void testPresettledProducersConfigurationAppliedAnonymousSendToTempQueue() throws Exception {
- String presettleConfig = "?amqp.presettleProducers=true";
- doTestProducerWithPresettleOptions(presettleConfig, false, true, true, true, TemporaryQueue.class);
- }
-
- @Test(timeout = 20000)
- public void testPresettledProducersConfigurationAppliedAnonymousSendToTopicNoRelaySupport() throws Exception {
- String presettleConfig = "?amqp.presettleProducers=true";
- doTestProducerWithPresettleOptions(presettleConfig, false, true, false, true, true, Topic.class);
- }
-
- @Test(timeout = 20000)
- public void testPresettledProducersConfigurationAppliedAnonymousSendToQueueNoRelaySupport() throws Exception {
- String presettleConfig = "?amqp.presettleProducers=true";
- doTestProducerWithPresettleOptions(presettleConfig, false, true, false, true, true, Queue.class);
- }
-
- @Test(timeout = 20000)
- public void testPresettledProducersConfigurationAppliedAnonymousSendToTempTopicNoRelaySupport() throws Exception {
- String presettleConfig = "?amqp.presettleProducers=true";
- doTestProducerWithPresettleOptions(presettleConfig, false, true, false, true, true, TemporaryTopic.class);
- }
-
- @Test(timeout = 20000)
- public void testPresettledProducersConfigurationAppliedAnonymousSendToTempQueueNoRelaySupport() throws Exception {
- String presettleConfig = "?amqp.presettleProducers=true";
- doTestProducerWithPresettleOptions(presettleConfig, false, true, false, true, true, TemporaryQueue.class);
- }
-
//----- Test the jms.presettleProducers option ---------------------------------//
@Test(timeout = 20000)
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9680fab5/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
index 53a4c43..df50151 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
@@ -776,7 +776,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase {
}
}
- @Test(timeout = 20000)
+ @Test //(timeout = 20000)
public void testCreateAnonymousProducerTargetContainsQueueCapabilityWhenAnonymousRelayNodeIsNotSupported() throws Exception {
doCreateAnonymousProducerTargetContainsCapabilityWhenAnonymousRelayNodeIsNotSupportedTestImpl(Queue.class);
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9680fab5/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderFactoryTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderFactoryTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderFactoryTest.java
index 3ecfdb1..da5f54d 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderFactoryTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderFactoryTest.java
@@ -108,9 +108,7 @@ public class AmqpProviderFactoryTest extends QpidJmsTestCase {
@Test(timeout = 20000)
public void testCreateProviderAppliesOptions() throws IOException, Exception {
URI configuredURI = new URI(peerURI.toString() +
- "?amqp.presettleConsumers=true" +
- "&amqp.presettleProducers=true" +
- "&amqp.traceFrames=true" +
+ "?amqp.traceFrames=true" +
"&amqp.traceBytes=true" +
"&amqp.channelMax=32");
Provider provider = AmqpProviderFactory.create(configuredURI);
@@ -119,23 +117,8 @@ public class AmqpProviderFactoryTest extends QpidJmsTestCase {
AmqpProvider amqpProvider = (AmqpProvider) provider;
- assertEquals(true, amqpProvider.isPresettleConsumers());
- assertEquals(true, amqpProvider.isPresettleProducers());
assertEquals(true, amqpProvider.isTraceBytes());
assertEquals(true, amqpProvider.isTraceFrames());
assertEquals(32, amqpProvider.getChannelMax());
}
-
- @Test(timeout = 20000)
- public void testCreateProviderAppliesPresettleOption() throws IOException, Exception {
- URI configuredURI = new URI(peerURI.toString() + "?amqp.presettle=true");
- Provider provider = AmqpProviderFactory.create(configuredURI);
- assertNotNull(provider);
- assertTrue(provider instanceof AmqpProvider);
-
- AmqpProvider amqpProvider = (AmqpProvider) provider;
-
- assertEquals(true, amqpProvider.isPresettleConsumers());
- assertEquals(true, amqpProvider.isPresettleProducers());
- }
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9680fab5/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderTest.java
index d9872b1..8f7258c 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderTest.java
@@ -17,7 +17,6 @@
package org.apache.qpid.jms.provider.amqp;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -74,7 +73,6 @@ public class AmqpProviderTest extends QpidJmsTestCase {
@Test(timeout=20000)
public void testCreate() {
provider = new AmqpProvider(peerURI);
- assertFalse(provider.isPresettleConsumers());
}
@Test(timeout=20000, expected=RuntimeException.class)
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9680fab5/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ConsumeFromAMQPTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ConsumeFromAMQPTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ConsumeFromAMQPTest.java
index fe97003..064d9d7 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ConsumeFromAMQPTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ConsumeFromAMQPTest.java
@@ -75,7 +75,7 @@ public class ConsumeFromAMQPTest extends AmqpTestSupport {
@Override
public String getAmqpConnectionURIOptions() {
- return "provider.presettleProducers=true&provider.presettleConsumers=true";
+ return "jms.presettlePolicy.presettleAll=true";
}
@Test
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9680fab5/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ProduceToAMQPTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ProduceToAMQPTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ProduceToAMQPTest.java
index 841bcd8..ce1c5ef 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ProduceToAMQPTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ProduceToAMQPTest.java
@@ -63,7 +63,7 @@ public class ProduceToAMQPTest extends AmqpTestSupport {
@Override
public String getAmqpConnectionURIOptions() {
- return "provider.presettle=true";
+ return "jms.presettlePolicy.presettleAll=true";
}
@Test
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9680fab5/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ProducerAndConsumerBench.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ProducerAndConsumerBench.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ProducerAndConsumerBench.java
index 753d249..a757e43 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ProducerAndConsumerBench.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/bench/ProducerAndConsumerBench.java
@@ -182,7 +182,7 @@ public class ProducerAndConsumerBench extends AmqpTestSupport {
@Override
public String getAmqpConnectionURIOptions() {
- return "provider.presettleProducers=true&provider.presettleConsumers=true";
+ return "jms.presettlePolicy.presettleAll=true";
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org