From 62f90eaf813c2f374e60bced7c26c6033c5dbeea Mon Sep 17 00:00:00 2001
From: Dmitrii Tikhomirov <dtikhomi@redhat.com>
Date: Wed, 7 Sep 2016 16:24:12 +0200
Subject: [PATCH] ARTEMIS-715 messages could be sent to wrong queue

In rare circumstances MessageProducer can send a message
to wrong queue
---
 .../activemq/artemis/core/client/impl/ClientProducerImpl.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 9ee120fa26..107df64dde 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);
    }