From e06e23b9f331facd3bdb44980a206a367bd47b52 Mon Sep 17 00:00:00 2001 From: Timothy Bish Date: Wed, 19 Mar 2014 12:52:07 -0400 Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-5110 Set accepted outcome for successful commit and rollback. --- .../apache/activemq/transport/amqp/AmqpProtocolConverter.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java index e83fdf4e1f..fe810ff551 100644 --- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java +++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java @@ -688,6 +688,8 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter { Rejected rejected = new Rejected(); rejected.setError(createErrorCondition("failed", er.getException().getMessage())); delivery.disposition(rejected); + } else { + delivery.disposition(Accepted.getInstance()); } LOG.debug("TX: {} settling {}", operation, action); delivery.settle();