ARTEMIS-715 messages could be sent to wrong queue

In rare circumstances MessageProducer can send a message
to wrong queue

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java

@@ -255,16 +255,16 @@ private void doSend(SimpleString sendingAddress,
             largeMessageSend(sendBlocking, msgI, theCredits, handler);
          }
          else {
-            sendRegularMessage(msgI, sendBlocking, theCredits, handler);
-            session.checkDefaultAddress(sendingAddress);
+            sendRegularMessage(sendingAddress, msgI, sendBlocking, theCredits, handler);
          }
       }
       finally {
          session.endCall();
       }
    }
 
-   private void sendRegularMessage(final MessageInternal msgI,
+   private void sendRegularMessage(final SimpleString sendingAddress,
+                                   final MessageInternal msgI,
                                    final boolean sendBlocking,
                                    final ClientProducerCredits theCredits,
                                    final SendAcknowledgementHandler handler) throws ActiveMQException {
@@ -280,6 +280,8 @@ private void sendRegularMessage(final MessageInternal msgI,
 
       theCredits.acquireCredits(creditSize);
 
+      session.checkDefaultAddress(sendingAddress);
+
       sessionContext.sendFullMessage(msgI, sendBlocking, handler, address);
    }
 
@@ -479,7 +481,7 @@ private void largeMessageSendStreamed(final boolean sendBlocking,
                msgI.putLongProperty(Message.HDR_LARGE_BODY_SIZE, deflaterReader.getTotalSize());
 
                msgI.getBodyBuffer().writeBytes(buff, 0, pos);
-               sendRegularMessage(msgI, sendBlocking, credits, handler);
+               sendRegularMessage(msgI.getAddress(), msgI, sendBlocking, credits, handler);
                return;
             }
             else {