Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4C34510A3F for ; Thu, 19 Sep 2013 11:01:05 +0000 (UTC) Received: (qmail 72874 invoked by uid 500); 19 Sep 2013 11:01:04 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 72799 invoked by uid 500); 19 Sep 2013 11:01:00 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 72792 invoked by uid 99); 19 Sep 2013 11:00:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Sep 2013 11:00:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 320E08876EF; Thu, 19 Sep 2013 11:00:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tabish@apache.org To: commits@activemq.apache.org Message-Id: <99c724350139492392e4ff80641117cc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: apply patch for: https://issues.apache.org/jira/browse/AMQ-4713 Date: Thu, 19 Sep 2013 11:00:59 +0000 (UTC) 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 Authored: Thu Sep 19 06:59:28 2013 -0400 Committer: Timothy Bish 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); }