SeleniumHQ
diff --git a/‎java/server/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java‎
Lines changed: 26 additions & 12 deletions b/‎java/server/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java‎
Lines changed: 26 additions & 12 deletions
@@ -556,18 +556,32 @@ public class NewSessionRunnable implements Runnable {
 
     @Override
     public void run() {
-      // We deliberately run this outside of a lock: if we're unsuccessful
-      // starting the session, we just put the request back on the queue.
-      // This does mean, however, that under high contention, we might end
-      // up starving a session request.
-      Set<Capabilities> stereotypes = getAvailableNodes().stream()
-        .filter(NodeStatus::hasCapacity)
-        .map(node -> node.getSlots().stream().map(Slot::getStereotype).collect(Collectors.toSet()))
-        .flatMap(Collection::stream)
-        .collect(Collectors.toSet());
-
-      Optional<SessionRequest> maybeRequest = sessionQueue.getNextAvailable(stereotypes);
-      maybeRequest.ifPresent(this::handleNewSessionRequest);
+      int initialSize = sessionQueue.getQueueContents().size();
+      boolean retry = initialSize != 0;
+
+      while (retry) {
+        // We deliberately run this outside of a lock: if we're unsuccessful
+        // starting the session, we just put the request back on the queue.
+        // This does mean, however, that under high contention, we might end
+        // up starving a session request.
+        Set<Capabilities> stereotypes =
+            getAvailableNodes().stream()
+                .filter(NodeStatus::hasCapacity)
+                .map(
+                    node ->
+                        node.getSlots().stream()
+                            .map(Slot::getStereotype)
+                            .collect(Collectors.toSet()))
+                .flatMap(Collection::stream)
+                .collect(Collectors.toSet());
+
+        Optional<SessionRequest> maybeRequest = sessionQueue.getNextAvailable(stereotypes);
+        maybeRequest.ifPresent(this::handleNewSessionRequest);
+
+        int currentSize = sessionQueue.getQueueContents().size();
+        retry = currentSize != 0 && currentSize != initialSize;
+        initialSize = currentSize;
+      }
     }
 
     private void handleNewSessionRequest(SessionRequest sessionRequest) {