activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject git commit: apply patch for: https://issues.apache.org/jira/browse/AMQ-4713
Date Thu, 19 Sep 2013 11:00:59 GMT
Updated Branches:
  refs/heads/trunk 8d5b9a558 -> fba8e2556


apply patch for: https://issues.apache.org/jira/browse/AMQ-4713

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

Branch: refs/heads/trunk
Commit: fba8e25563a1d3368025891ffe2df46ea0767a0e
Parents: 8d5b9a5
Author: Timothy Bish <tabish121@gmai.com>
Authored: Thu Sep 19 06:59:28 2013 -0400
Committer: Timothy Bish <tabish121@gmai.com>
Committed: Thu Sep 19 07:00:26 2013 -0400

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


http://git-wip-us.apache.org/repos/asf/activemq/blob/fba8e255/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 9d2e079..893fa1b 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
@@ -885,7 +885,7 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter {
 
         private void settle(final Delivery delivery, final int ackType) throws Exception
{
             byte[] tag = delivery.getTag();
-            if (tag != null && tag.length > 0) {
+            if (tag != null && tag.length > 0 && delivery.remotelySettled())
{
                 checkinTag(tag);
             }
 


Mime
View raw message