ARTEMIS-4734 mitigate NPE in ReplicationManager

apache · Apr 22, 2024 · c2acfc6 · c2acfc6
1 parent 86f7250
commit c2acfc6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/...server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java b/...server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
@@ -462,6 +462,9 @@ private OperationContext sendReplicatePacket(final Packet packet, boolean lineUp
       }
 
       final OperationContext repliToken = OperationContextImpl.getContext(ioExecutorFactory);
+      if (repliToken == null) {
+         throw ActiveMQMessageBundle.BUNDLE.replicationFailureRepliTokenNull(packet.toString(), ioExecutorFactory.toString());
+      }
       if (lineUp) {
          repliToken.replicationLineUp();
       }

diff --git a/...s-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java b/...s-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
@@ -548,4 +548,7 @@ IllegalStateException invalidRoutingTypeUpdate(String queueName,
 
    @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);
 }