ARTEMIS-715 messages could be sent to wrong queue In rare circumstances MessageProducer can send a message to wrong queue
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/62f90eaf Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/62f90eaf Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/62f90eaf Branch: refs/heads/master Commit: 62f90eaf813c2f374e60bced7c26c6033c5dbeea Parents: 12716a3 Author: Dmitrii Tikhomirov <[email protected]> Authored: Wed Sep 7 16:24:12 2016 +0200 Committer: Clebert Suconic <[email protected]> Committed: Thu Sep 8 09:26:11 2016 -0400 ---------------------------------------------------------------------- .../activemq/artemis/core/client/impl/ClientProducerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/62f90eaf/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java index 9ee120f..107df64 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java @@ -267,7 +267,6 @@ public class ClientProducerImpl implements ClientProducerInternal { } else { sendRegularMessage(msgI, sendBlocking, theCredits, handler); - session.checkDefaultAddress(sendingAddress); } } finally { @@ -291,6 +290,8 @@ public class ClientProducerImpl implements ClientProducerInternal { theCredits.acquireCredits(creditSize); + session.checkDefaultAddress(address); + sessionContext.sendFullMessage(msgI, sendBlocking, handler, address); }
