[prev in list] [next in list] [prev in thread] [next in thread] 

List:       activemq-commits
Subject:    (activemq-artemis) branch main updated: ARTEMIS-4734 mitigate NPE in ReplicationManager
From:       jbertram () apache ! org
Date:       2024-04-25 17:18:55
Message-ID: 171406553565.515915.12533500745259231239 () gitbox2-he-fi ! apache ! org
[Download RAW message or body]

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

jbertram 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 934fe24e5c ARTEMIS-4734 mitigate NPE in ReplicationManager
934fe24e5c is described below

commit 934fe24e5c03f4801e8a3934cc02bbc10f0325ff
Author: Justin Bertram <jbertram@apache.org>
AuthorDate: Mon Apr 22 13:07:07 2024 -0500

    ARTEMIS-4734 mitigate NPE in ReplicationManager
---
 .../apache/activemq/artemis/core/replication/ReplicationManager.java   | 3 +++
 .../org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java \
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
 index f6402bfe55..9bbbf46e3a 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
                
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
 @@ -462,6 +462,9 @@ public final class ReplicationManager implements \
ActiveMQComponent {  }
 
       final OperationContext repliToken = \
OperationContextImpl.getContext(ioExecutorFactory); +      if (repliToken == null) {
+         throw ActiveMQMessageBundle.BUNDLE.replicationFailureRepliTokenNull(packet.toString(), \
ioExecutorFactory.toString()); +      }
       if (lineUp) {
          repliToken.replicationLineUp();
       }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java \
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
 index bf2cf7491c..63f3956bab 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
                
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
 @@ -548,4 +548,7 @@ public interface ActiveMQMessageBundle {
 
    @Message(id = 229252, value = "Invalid HAPolicy property: {}")
    RuntimeException unsupportedHAPolicyPropertyType(String invalidHAPolicy);
+
+   @Message(id = 229253, value = "Unable to acquire OperationContext when \
replicating packet: {}. ExecutorFactory: {}") +   IllegalStateException \
replicationFailureRepliTokenNull(String packet, String executorFactory);  }


[prev in list] [next in list] [prev in thread] [next in thread]