Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1A7EC200C01 for ; Wed, 4 Jan 2017 17:59:52 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 1925D160B21; Wed, 4 Jan 2017 16:59:52 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6A0BE160B3A for ; Wed, 4 Jan 2017 17:59:51 +0100 (CET) Received: (qmail 41217 invoked by uid 500); 4 Jan 2017 16:59:50 -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 41201 invoked by uid 99); 4 Jan 2017 16:59:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jan 2017 16:59:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6E7E5DFA33; Wed, 4 Jan 2017 16:59:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbertram@apache.org To: commits@activemq.apache.org Date: Wed, 04 Jan 2017 16:59:51 -0000 Message-Id: <84a83325a1c140f6b1e8f82dde94fa89@git.apache.org> In-Reply-To: <476f947a65da45d690c1239e2d0b54eb@git.apache.org> References: <476f947a65da45d690c1239e2d0b54eb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] activemq-artemis git commit: ARTEMIS-908: Hold connection lock when issuing credits archived-at: Wed, 04 Jan 2017 16:59:52 -0000 ARTEMIS-908: Hold connection lock when issuing credits Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f2f35520 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f2f35520 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f2f35520 Branch: refs/heads/master Commit: f2f355206740b6efb2359ad7296409fbfd62c5b3 Parents: 4dc9751 Author: Ulf Lilleengen Authored: Tue Jan 3 11:03:38 2017 +0100 Committer: Justin Bertram Committed: Wed Jan 4 10:59:33 2017 -0600 ---------------------------------------------------------------------- .../artemis/protocol/amqp/broker/AMQPSessionCallback.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f2f35520/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java ---------------------------------------------------------------------- diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java index d8c908c..3dce5dc 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java @@ -433,9 +433,11 @@ public class AMQPSessionCallback implements SessionCallback { store.checkMemory(new Runnable() { @Override public void run() { - if (receiver.getRemoteCredit() < threshold) { - receiver.flow(credits); - connection.flush(); + synchronized (connection.getLock()) { + if (receiver.getRemoteCredit() < threshold) { + receiver.flow(credits); + connection.flush(); + } } } });