activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject activemq-artemis git commit: ARTEMIS-1732 Fixing AMQPSenderTest
Date Thu, 02 Aug 2018 02:14:56 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master a7e4ce490 -> e290071ce


ARTEMIS-1732 Fixing AMQPSenderTest


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

Branch: refs/heads/master
Commit: e290071ceddd3ac66f23ab537e3e400ddd25bdf1
Parents: a7e4ce4
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Wed Aug 1 22:14:15 2018 -0400
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Wed Aug 1 22:14:15 2018 -0400

----------------------------------------------------------------------
 .../artemis/protocol/amqp/broker/AMQPSessionCallback.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e290071c/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 86c0687..f940c5a 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
@@ -581,7 +581,9 @@ public class AMQPSessionCallback implements SessionCallback {
          Runnable creditRunnable = () -> {
             connection.lock();
             try {
-               receiver.flow(credits);
+               if (receiver.getRemoteCredit() <= threshold) {
+                  receiver.flow(credits);
+               }
             } finally {
                connection.unlock();
             }


Mime
View raw message