You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2015/09/22 21:03:54 UTC
[1/2] activemq-artemis git commit: Revert "ARTEMIS-225 validate
clientID is set for durable sub"
Repository: activemq-artemis
Updated Branches:
refs/heads/master bfaaae8c9 -> d88097794
Revert "ARTEMIS-225 validate clientID is set for durable sub"
This reverts commit 1c933cfbaeae6518e2fcf55bcb58f3b714f04370.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7a337a7e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7a337a7e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7a337a7e
Branch: refs/heads/master
Commit: 7a337a7e552c0679d80ef2600c2ef6f7daf954ba
Parents: bfaaae8
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Sep 21 20:39:07 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Sep 21 20:39:07 2015 -0400
----------------------------------------------------------------------
.../ra/inflow/ActiveMQActivationSpec.java | 5 --
.../ra/ActiveMQMessageHandlerTest.java | 59 --------------------
2 files changed, 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7a337a7e/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
index 0b46b20..f80342b 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
@@ -696,11 +696,6 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
propsNotSet.add(new PropertyDescriptor("subscriptionName", ActiveMQActivationSpec.class));
errorMessages.add("If subscription is durable then subscription name must be specified.");
}
-
- if ((isSubscriptionDurable() && getClientID() == null) || (isSubscriptionDurable() && getClientID() != null && getClientID().length() == 0)) {
- propsNotSet.add(new PropertyDescriptor("clientID", ActiveMQActivationSpec.class));
- errorMessages.add("If subscription is durable then clientID must be specified.");
- }
}
catch (IntrospectionException e) {
e.printStackTrace();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7a337a7e/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerTest.java
index 7f94f81..a5636cf 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerTest.java
@@ -715,65 +715,6 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase {
}
@Test
- public void testNullClientID() throws Exception {
- ActiveMQResourceAdapter qResourceAdapter = newResourceAdapter();
- MyBootstrapContext ctx = new MyBootstrapContext();
- qResourceAdapter.start(ctx);
-
- ActiveMQActivationSpec spec = new ActiveMQActivationSpec();
- spec.setResourceAdapter(qResourceAdapter);
- spec.setUseJNDI(false);
- spec.setDestination("mdbTopic");
- spec.setSubscriptionDurability("Durable");
- spec.setSubscriptionName("sub");
- spec.setSetupAttempts(1);
- spec.setShareSubscriptions(true);
- spec.setMaxSession(1);
-
- CountDownLatch latch = new CountDownLatch(5);
- DummyMessageEndpoint endpoint = new DummyMessageEndpoint(latch);
- DummyMessageEndpointFactory endpointFactory = new DummyMessageEndpointFactory(endpoint, false);
- try {
- qResourceAdapter.endpointActivation(endpointFactory, spec);
- fail();
- }
- catch (Exception e) {
- assertTrue(e instanceof InvalidPropertyException);
- assertEquals("clientID", ((InvalidPropertyException) e).getInvalidPropertyDescriptors()[0].getName());
- }
- }
-
- @Test
- public void testEmptyClientID() throws Exception {
- ActiveMQResourceAdapter qResourceAdapter = newResourceAdapter();
- MyBootstrapContext ctx = new MyBootstrapContext();
- qResourceAdapter.start(ctx);
-
- ActiveMQActivationSpec spec = new ActiveMQActivationSpec();
- spec.setResourceAdapter(qResourceAdapter);
- spec.setUseJNDI(false);
- spec.setDestination("mdbTopic");
- spec.setSubscriptionDurability("Durable");
- spec.setSubscriptionName("sub");
- spec.setClientID("");
- spec.setSetupAttempts(1);
- spec.setShareSubscriptions(true);
- spec.setMaxSession(1);
-
- CountDownLatch latch = new CountDownLatch(5);
- DummyMessageEndpoint endpoint = new DummyMessageEndpoint(latch);
- DummyMessageEndpointFactory endpointFactory = new DummyMessageEndpointFactory(endpoint, false);
- try {
- qResourceAdapter.endpointActivation(endpointFactory, spec);
- fail();
- }
- catch (Exception e) {
- assertTrue(e instanceof InvalidPropertyException);
- assertEquals("clientID", ((InvalidPropertyException) e).getInvalidPropertyDescriptors()[0].getName());
- }
- }
-
- @Test
public void testBadDestinationType() throws Exception {
ActiveMQResourceAdapter qResourceAdapter = newResourceAdapter();
MyBootstrapContext ctx = new MyBootstrapContext();
[2/2] activemq-artemis git commit: This closes #173
Posted by jb...@apache.org.
This closes #173
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d8809779
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d8809779
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d8809779
Branch: refs/heads/master
Commit: d88097794c6a84b3085b0e6cc248772f459bc91c
Parents: bfaaae8 7a337a7
Author: jbertram <jb...@apache.org>
Authored: Tue Sep 22 14:02:47 2015 -0500
Committer: jbertram <jb...@apache.org>
Committed: Tue Sep 22 14:02:47 2015 -0500
----------------------------------------------------------------------
.../ra/inflow/ActiveMQActivationSpec.java | 5 --
.../ra/ActiveMQMessageHandlerTest.java | 59 --------------------
2 files changed, 64 deletions(-)
----------------------------------------------------------------------