Simplify with lambda.

1 files changed, 2 insertions, 8 deletions

diff --git a/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java b/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java
index 2a4a123a60b..920d285d200 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java
@@ -4,7 +4,6 @@ package com.yahoo.messagebus;
 import com.yahoo.messagebus.routing.Route;
 import com.yahoo.messagebus.routing.RoutingTable;
 
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Queue;
 import java.util.concurrent.CountDownLatch;
@@ -209,7 +208,7 @@ public final class SourceSession implements ReplyHandler, MessageBus.SendBlocked
         }
     }
 
-    Reply createSendTimedoutReply(Message msg, Error error) {
+    private Reply createSendTimedoutReply(Message msg, Error error) {
         Reply reply = new EmptyReply();
         reply.setMessage(msg);
         reply.addError(error);
@@ -246,12 +245,7 @@ public final class SourceSession implements ReplyHandler, MessageBus.SendBlocked
 
     private void expireStalledBlockedMessages() {
         synchronized (lock) {
-            Iterator<BlockedMessage> each = blockedQ.iterator();
-            while (each.hasNext()) {
-                if (each.next().notifyIfExpired()) {
-                    each.remove();
-                }
-            }
+            blockedQ.removeIf(BlockedMessage::notifyIfExpired);
         }
     }