(activemq-artemis) branch main updated: ARTEMIS-4713 mitigate NPE in LargeMessageControllerImpl

[clebertsuconic]

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new 9f50aff46d ARTEMIS-4713 mitigate NPE in LargeMessageControllerImpl
9f50aff46d is described below

commit 9f50aff46ddde8cec612528181e91bb4205b133d
Author: Justin Bertram <jbert...@apache.org>
AuthorDate: Thu Apr 4 14:34:24 2024 -0500

    ARTEMIS-4713 mitigate NPE in LargeMessageControllerImpl
---
 .../activemq/artemis/core/client/impl/LargeMessageControllerImpl.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
index 11857c9ee6..798bd49a6a 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
@@ -318,6 +318,9 @@ public class LargeMessageControllerImpl implements 
LargeMessageController {
    @Override
    public LargeData take() throws InterruptedException {
       LargeData largeData = largeMessageData.take();
+      if (largeData == null) {
+         return null;
+      }
       bytesTaken += largeData.getChunk().length;
       return largeData;
    }