https://bugzilla.redhat.com/show_bug.cgi?id=1344286 Fixing sending af…

…ter security exception
hornetq · Jun 20, 2016 · f1b3aa4 · f1b3aa4
1 parent 455640a
commit f1b3aa4
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerImpl.java b/hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerImpl.java
@@ -272,8 +272,7 @@ private void doSend(SimpleString sendingAddress, final Message msg) throws Horne
          }
          else
          {
-            sendRegularMessage(msgI, sendBlocking, theCredits);
-            session.checkDefaultAddress(sendingAddress);
+            sendRegularMessage(sendingAddress, msgI, sendBlocking, theCredits);
          }
       }
       finally
@@ -282,7 +281,7 @@ private void doSend(SimpleString sendingAddress, final Message msg) throws Horne
       }
    }
 
-   private void sendRegularMessage(MessageInternal msgI, boolean sendBlocking, final ClientProducerCredits theCredits) throws HornetQException
+   private void sendRegularMessage(final SimpleString sendingAddress, MessageInternal msgI, boolean sendBlocking, final ClientProducerCredits theCredits) throws HornetQException
    {
       try
       {
@@ -299,6 +298,8 @@ private void sendRegularMessage(MessageInternal msgI, boolean sendBlocking, fina
          throw new HornetQInterruptedException(e);
       }
 
+      session.checkDefaultAddress(sendingAddress);
+
       SessionSendMessage packet = new SessionSendMessage(msgI, sendBlocking);
 
       if (sendBlocking)
@@ -546,7 +547,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);
+               sendRegularMessage(msgI.getAddress(), msgI, sendBlocking, credits);
                return;
             }