Repository: activemq Updated Branches: refs/heads/activemq-5.13.x e5b86116c -> f8488916c
revert sync ack send for https://issues.apache.org/jira/browse/AMQ-3519 due to rework in https://issues.apache.org/jira/browse/AMQ-5068 - sync send no longer needed because redelivered flag is persisted before dispatch. This avoids a roundtrip overhead on individual ack, ie priority or nonBlockingRedelivery options in the mix (cherry picked from commit c78eddce7ed3045b5508dd6713252dca8766436c) Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f8488916 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f8488916 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f8488916 Branch: refs/heads/activemq-5.13.x Commit: f8488916c2cc04c402e437fdbc2f61f118189d08 Parents: e5b8611 Author: gtully <gary.tu...@gmail.com> Authored: Fri Dec 11 17:05:49 2015 +0000 Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Committed: Fri Dec 11 17:34:35 2015 +0000 ---------------------------------------------------------------------- .../src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/f8488916/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java ---------------------------------------------------------------------- diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java index a67022b..adbcf39 100755 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java @@ -924,7 +924,7 @@ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsC registerSync(); MessageAck ack = new MessageAck(md, MessageAck.INDIVIDUAL_ACK_TYPE, 1); ack.setTransactionId(session.getTransactionContext().getTransactionId()); - session.syncSendPacket(ack); + session.sendAck(ack); } private void afterMessageIsConsumed(MessageDispatch md, boolean messageExpired) throws JMSException {
