You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by mi...@apache.org on 2020/03/07 20:23:00 UTC
[activemq-artemis] branch master updated: Revert "ARTEMIS-2644
Include client id into non durable subscriber queue name"
This is an automated email from the ASF dual-hosted git repository.
michaelpearce pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/master by this push:
new 45fe604 Revert "ARTEMIS-2644 Include client id into non durable subscriber queue name"
new c12d817 This closes #3007
45fe604 is described below
commit 45fe60485974b5d6848ecf07a8d01d04fac0f539
Author: brusdev <br...@gmail.com>
AuthorDate: Thu Mar 5 19:09:03 2020 +0100
Revert "ARTEMIS-2644 Include client id into non durable subscriber queue name"
This reverts commit be0fa47d63fd266660685d139a04ecdc3c64737a.
---
.../artemis/jms/client/ActiveMQSession.java | 2 +-
.../integration/jms/consumer/JmsConsumerTest.java | 31 ----------------------
2 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
index d879dfe..c61df98 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
@@ -834,7 +834,7 @@ public class ActiveMQSession implements QueueSession, TopicSession {
throw new RuntimeException("Subscription name cannot be null for durable topic consumer");
// Non durable sub
- queueName = ActiveMQDestination.createQueueNameForSubscription(false, connection.getClientID(), UUID.randomUUID().toString());
+ queueName = new SimpleString(UUID.randomUUID().toString());
createTemporaryQueue(dest, RoutingType.MULTICAST, queueName, coreFilterString, response);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/JmsConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/JmsConsumerTest.java
index 64bedeb..c4fd897 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/JmsConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/JmsConsumerTest.java
@@ -31,12 +31,10 @@ import javax.jms.MessageProducer;
import javax.jms.QueueBrowser;
import javax.jms.Session;
import javax.jms.TextMessage;
-import javax.jms.TopicSession;
import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.api.core.TransportConfiguration;
-import org.apache.activemq.artemis.api.core.management.QueueControl;
import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants;
import org.apache.activemq.artemis.api.jms.JMSFactoryType;
@@ -552,35 +550,6 @@ public class JmsConsumerTest extends JMSTestBase {
}
@Test
- public void testTopicConsumer() throws Exception {
- String clientId = "TESTID";
-
- conn = cf.createConnection();
- conn.setClientID(clientId);
- conn.start();
-
- try {
- Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- topic = session.createTopic(T_NAME);
- MessageProducer producer = session.createProducer(topic);
- MessageConsumer consumer = ((TopicSession)session).createSubscriber(topic);
-
- for (Object queueControlObject : server.getManagementService().getResources(QueueControl.class)) {
- QueueControl queueControl = (QueueControl)queueControlObject;
- if (queueControl.getAddress().compareTo(T_NAME) == 0) {
- assertTrue(queueControl.getName().contains(clientId));
- break;
- }
- }
-
- producer.send(session.createTextMessage("test"));
- Assert.assertNotNull(consumer.receive(5000));
- } finally {
- conn.close();
- }
- }
-
- @Test
public void testSharedConsumer() throws Exception {
conn = cf.createConnection();
conn.start();