From 04f74425c9b4938baf0e230e03884683311a417a Mon Sep 17 00:00:00 2001 From: Stanislav Knot Date: Mon, 18 Dec 2017 12:28:30 +0100 Subject: [PATCH] ARTEMIS-1329 testNoLocalReconnect was failing with OpenWire protocol --- .../artemis/core/protocol/openwire/amq/AMQConsumer.java | 2 +- .../integration/jms/client/NoLocalSubscriberTest.java | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java index fb505821b1..c98b9d2933 100644 --- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java @@ -95,7 +95,7 @@ public class AMQConsumer { } else { preAck = true; } - String noLocalSelector = MessageUtil.CONNECTION_ID_PROPERTY_NAME.toString() + "<>'" + this.getId().getConnectionId() + "'"; + String noLocalSelector = MessageUtil.CONNECTION_ID_PROPERTY_NAME.toString() + "<>'" + info.getClientId() + "'"; if (selector == null) { selector = new SimpleString(noLocalSelector); } else { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NoLocalSubscriberTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NoLocalSubscriberTest.java index 860b9ad003..64d0775dc2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NoLocalSubscriberTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NoLocalSubscriberTest.java @@ -26,6 +26,7 @@ import javax.jms.TextMessage; import javax.jms.Topic; import javax.jms.TopicSubscriber; +import org.apache.activemq.artemis.reader.MessageUtil; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.JMSTestBase; import org.apache.activemq.artemis.utils.RandomUtil; @@ -145,7 +146,9 @@ public class NoLocalSubscriberTest extends JMSTestBase { connection.setClientID(clientID); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageProducer messageProducer = session.createProducer(topic); - messageProducer.send(session.createTextMessage("M3")); + TextMessage textMessage = session.createTextMessage("M3"); + textMessage.setStringProperty(MessageUtil.CONNECTION_ID_PROPERTY_NAME.toString(), clientID); + messageProducer.send(textMessage); connection.close(); } @@ -157,7 +160,9 @@ public class NoLocalSubscriberTest extends JMSTestBase { connection.setClientID(clientID + "_different"); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageProducer messageProducer = session.createProducer(topic); - messageProducer.send(session.createTextMessage("M4")); + TextMessage textMessage = session.createTextMessage("M4"); + textMessage.setStringProperty(MessageUtil.CONNECTION_ID_PROPERTY_NAME.toString(), clientID + "_different"); + messageProducer.send(textMessage); connection.close(); }