Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-1329 testNoLocalReconnect was failing with OpenWire protocol

This commit is contained in:
Stanislav Knot 2017-12-18 12:28:30 +01:00 committed by Clebert Suconic
parent fe537fa257
commit 04f74425c9
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java
View File

@ -95,7 +95,7 @@ public class AMQConsumer {
} else { } else {
preAck = true; 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) { if (selector == null) {
selector = new SimpleString(noLocalSelector); selector = new SimpleString(noLocalSelector);
} else { } else {

9
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NoLocalSubscriberTest.java
View File

@ -26,6 +26,7 @@ import javax.jms.TextMessage;
import javax.jms.Topic; import javax.jms.Topic;
import javax.jms.TopicSubscriber; 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.integration.IntegrationTestLogger;
import org.apache.activemq.artemis.tests.util.JMSTestBase; import org.apache.activemq.artemis.tests.util.JMSTestBase;
import org.apache.activemq.artemis.utils.RandomUtil; import org.apache.activemq.artemis.utils.RandomUtil;
@ -145,7 +146,9 @@ public class NoLocalSubscriberTest extends JMSTestBase {
connection.setClientID(clientID); connection.setClientID(clientID);
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer messageProducer = session.createProducer(topic); 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(); connection.close();
} }
@ -157,7 +160,9 @@ public class NoLocalSubscriberTest extends JMSTestBase {
connection.setClientID(clientID + "_different"); connection.setClientID(clientID + "_different");
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer messageProducer = session.createProducer(topic); 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(); connection.close();
} }