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

ARTEMIS-715 messages could be sent to wrong queue 

In rare circumstances MessageProducer can send a message
to wrong queue
This commit is contained in:
Dmitrii Tikhomirov 2016-09-19 19:00:21 +02:00 committed by Clebert Suconic
parent 1f5f45ca9b
commit 6b8d52295e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -266,7 +266,7 @@ public class ClientProducerImpl implements ClientProducerInternal {
largeMessageSend(sendBlocking, msgI, theCredits, handler); largeMessageSend(sendBlocking, msgI, theCredits, handler);
} }
else { else {
sendRegularMessage(msgI, sendBlocking, theCredits, handler); sendRegularMessage(sendingAddress, msgI, sendBlocking, theCredits, handler);
} }
} }
finally { finally {
@ -274,7 +274,8 @@ public class ClientProducerImpl implements ClientProducerInternal {
} }
} }
private void sendRegularMessage(final MessageInternal msgI, private void sendRegularMessage(final SimpleString sendingAddress,
final MessageInternal msgI,
final boolean sendBlocking, final boolean sendBlocking,
final ClientProducerCredits theCredits, final ClientProducerCredits theCredits,
final SendAcknowledgementHandler handler) throws ActiveMQException { final SendAcknowledgementHandler handler) throws ActiveMQException {
@ -290,7 +291,7 @@ public class ClientProducerImpl implements ClientProducerInternal {
theCredits.acquireCredits(creditSize); theCredits.acquireCredits(creditSize);
session.checkDefaultAddress(address); session.checkDefaultAddress(sendingAddress);
sessionContext.sendFullMessage(msgI, sendBlocking, handler, address); sessionContext.sendFullMessage(msgI, sendBlocking, handler, address);
} }
@ -491,7 +492,7 @@ public class ClientProducerImpl implements ClientProducerInternal {
msgI.putLongProperty(Message.HDR_LARGE_BODY_SIZE, deflaterReader.getTotalSize()); msgI.putLongProperty(Message.HDR_LARGE_BODY_SIZE, deflaterReader.getTotalSize());
msgI.getBodyBuffer().writeBytes(buff, 0, pos); msgI.getBodyBuffer().writeBytes(buff, 0, pos);
sendRegularMessage(msgI, sendBlocking, credits, handler); sendRegularMessage(msgI.getAddress(), msgI, sendBlocking, credits, handler);
return; return;
} }
else { else {