ARTEMIS-5166 Improving ReconnectTest (avoiding NPEs)

apache · Nov 21, 2024 · e985ec5 · e985ec5
1 parent 7965877
commit e985ec5
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...s/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java b/...s/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java
@@ -410,8 +410,12 @@ public void testClosingConsumerTimeout() throws Exception {
    }
 
    boolean matchConsumers(ActiveMQServer server, ClientSessionInternal session, ClientConsumer clientConsumer) {
-      Set<ServerConsumer> serverConsumers = server.getSessionByID(session.getName()).getServerConsumers();
-      if (serverConsumers.size() != 1) {
+      ServerSession serverSession = server.getSessionByID(session.getName());
+      if (serverSession == null) {
+         return false;
+      }
+      Set<ServerConsumer> serverConsumers = serverSession.getServerConsumers();
+      if (serverConsumers == null || serverConsumers.size() != 1) {
          return false;
       }
       ServerConsumer serverConsumer = serverConsumers.iterator().next();