activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject git commit: https://issues.apache.org/jira/browse/AMQ-5110
Date Wed, 19 Mar 2014 16:56:02 GMT
Repository: activemq
Updated Branches:
  refs/heads/trunk 6056fde7e -> e06e23b9f


https://issues.apache.org/jira/browse/AMQ-5110

Set accepted outcome for successful commit and rollback.

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/e06e23b9
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/e06e23b9
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/e06e23b9

Branch: refs/heads/trunk
Commit: e06e23b9f331facd3bdb44980a206a367bd47b52
Parents: 6056fde
Author: Timothy Bish <tabish121@gmai.com>
Authored: Wed Mar 19 12:52:07 2014 -0400
Committer: Timothy Bish <tabish121@gmai.com>
Committed: Wed Mar 19 12:55:43 2014 -0400

----------------------------------------------------------------------
 .../org/apache/activemq/transport/amqp/AmqpProtocolConverter.java  | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/e06e23b9/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
----------------------------------------------------------------------
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 e83fdf4..fe810ff 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();


Mime
View raw message