From 5132775371300de3a0c34e119d205f546f070c63 Mon Sep 17 00:00:00 2001 From: Clebert Suconic Date: Tue, 23 Oct 2018 12:43:36 -0400 Subject: [PATCH] ARTEMIS-2146 Avoiding NPE on AMQP Flow Control AMQP Flow control will disable consumer flow control (setting credits to null) This will avoid a race checking flow control. --- .../activemq/artemis/core/server/impl/ServerConsumerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java index 470aeb658e..e38c22c024 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java @@ -349,7 +349,9 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener { @Override public HandleStatus handle(final MessageReference ref) throws Exception { - if (callback != null && !callback.hasCredits(this) || availableCredits != null && availableCredits.get() <= 0) { + // available credits can be set back to null with a flow control option. + AtomicInteger checkInteger = availableCredits; + if (callback != null && !callback.hasCredits(this) || checkInteger != null && checkInteger.get() <= 0) { if (logger.isDebugEnabled()) { logger.debug(this + " is busy for the lack of credits. Current credits = " + availableCredits +