Cleanup

Signed-off-by: HenrikJannsen <[email protected]>
bisq-network · Jan 6, 2023 · 9fe3d22 · 9fe3d22
1 parent 8b0f8fb
commit 9fe3d22
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/p2p/src/main/java/bisq/network/p2p/peers/BroadcastHandler.java b/p2p/src/main/java/bisq/network/p2p/peers/BroadcastHandler.java
@@ -35,6 +35,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -310,8 +311,8 @@ private void maybeNotifyListeners(List<Broadcaster.BroadcastRequest> broadcastRe
         if (numOfCompletedBroadcasts.get() == numOfCompletedBroadcastsTarget) {
             // We have heard back from 3 peers (or all peers if numPeers is lower) so we consider the message was sufficiently broadcast.
             broadcastRequests.stream()
-                    .filter(broadcastRequest -> broadcastRequest.getListener() != null)
                     .map(Broadcaster.BroadcastRequest::getListener)
+                    .filter(Objects::nonNull)
                     .forEach(listener -> listener.onSufficientlyBroadcast(broadcastRequests));
         } else {
             // We check if number of open requests to peers is less than we need to reach numOfCompletedBroadcastsTarget.
@@ -323,8 +324,8 @@ private void maybeNotifyListeners(List<Broadcaster.BroadcastRequest> broadcastRe
             boolean timeoutAndNotEnoughSucceeded = timeoutTriggered.get() && numOfCompletedBroadcasts.get() < numOfCompletedBroadcastsTarget;
             if (notEnoughSucceededOrOpen || timeoutAndNotEnoughSucceeded) {
                 broadcastRequests.stream()
-                        .filter(broadcastRequest -> broadcastRequest.getListener() != null)
                         .map(Broadcaster.BroadcastRequest::getListener)
+                        .filter(Objects::nonNull)
                         .forEach(listener -> listener.onNotSufficientlyBroadcast(numOfCompletedBroadcasts.get(), numOfFailedBroadcasts.get()));
             }
         }