ARTEMIS-4804 & ARTEMIS-4805 mitigate NPEs in ScaleDownHandler

apache · Sep 5, 2024 · 8b265f4 · 8b265f4
1 parent ec8026e
commit 8b265f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...nt/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java b/...nt/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
@@ -240,4 +240,7 @@ public interface ActiveMQClientMessageBundle {
 
    @Message(id = 219068, value = "Connection closed while receiving cluster topology. Group:{}")
    ActiveMQObjectClosedException connectionClosedOnReceiveTopology(DiscoveryGroup discoveryGroup);
+
+   @Message(id = 219069, value = "Unable to create Session. Either the ClientSessionFactory is closed or the ClientProtocolManager is dead.")
+   IllegalStateException unableToCreateSession();
 }
diff --git a/.../src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java b/.../src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
@@ -846,7 +846,7 @@ private ClientSession createSessionInternal(final String rawUsername,
       synchronized (sessions) {
          if (closed || !clientProtocolManager.isAlive()) {
             session.close();
-            return null;
+            throw ActiveMQClientMessageBundle.BUNDLE.unableToCreateSession();
          }
          sessions.add(session);
       }