fix minor npe (hyperledger#5495)

Signed-off-by: garyschulte <garyschulte@gmail.com>
gfukushima · May 25, 2023 · 128f95e · 128f95e
1 parent 65bcc55
commit 128f95e
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/...in/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryController.java b/...in/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryController.java
@@ -797,12 +797,14 @@ void execute() {
                       execute();
                     }));
       } else {
-        final Map<PacketType, PeerInteractionState> peerInteractionStateMap =
-            inflightInteractions.get(peerId);
-        peerInteractionStateMap.remove(expectedType);
-        if (peerInteractionStateMap.isEmpty()) {
-          inflightInteractions.remove(peerId);
-        }
+        Optional.ofNullable(inflightInteractions.get(peerId))
+            .ifPresent(
+                peerInterationStateMap -> {
+                  peerInterationStateMap.remove(expectedType);
+                  if (peerInterationStateMap.isEmpty()) {
+                    inflightInteractions.remove(peerId);
+                  }
+                });
       }
     }