[grid] Adding a NPE check

diemol · diemol · commit 7663dfda5f3e · 2022-03-04T11:08:20.000+01:00
[skip ci]
diff --git a/java/src/org/openqa/selenium/grid/node/local/LocalNode.java b/java/src/org/openqa/selenium/grid/node/local/LocalNode.java
@@ -157,11 +157,16 @@ private LocalNode(
       .expireAfterAccess(sessionTimeout)
       .ticker(ticker)
       .removalListener((RemovalListener<SessionId, SessionSlot>) notification -> {
-        // Attempt to stop the session
-        LOG.log(Debug.getDebugLogLevel(), "Stopping session {0}", notification.getKey().toString());
-        SessionSlot slot = notification.getValue();
-        if (!slot.isAvailable()) {
-          slot.stop();
+        if (notification.getKey() != null && notification.getValue() != null) {
+          // Attempt to stop the session
+          LOG.log(Debug.getDebugLogLevel(), "Stopping session {0}",
+                  notification.getKey().toString());
+          SessionSlot slot = notification.getValue();
+          if (!slot.isAvailable()) {
+            slot.stop();
+          }
+        } else {
+          LOG.log(Debug.getDebugLogLevel(), "Received stop session notification with null values");
         }
       })
       .build();
