diff --git a/fitnesse/src/fitnesse/responders/run/SocketDealer.java b/fitnesse/src/fitnesse/responders/run/SocketDealer.java
new file mode 100644
index 0000000000..57edc1e739
--- /dev/null
+++ b/fitnesse/src/fitnesse/responders/run/SocketDealer.java
@@ -0,0 +1,33 @@
+// Copyright (C) 2003-2009 by Object Mentor, Inc. All rights reserved.
+// Released under the terms of the CPL Common Public License version 1.0.
+package fitnesse.responders.run;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+public class SocketDealer {
+  private Map<Integer, SocketSeeker> waitingList = new HashMap<Integer, SocketSeeker>(17);
+  private int ticketCounter = 1;
+
+  public synchronized int seekingSocket(SocketSeeker seeker) {
+    int ticket = ticketCounter++;
+    waitingList.put(new Integer(ticket), seeker);
+    return ticket;
+  }
+
+  public synchronized Collection<SocketSeeker> getWaitingList() {
+    return waitingList.values();
+  }
+
+  public synchronized void dealSocketTo(int ticket, SocketDoner doner) throws Exception {
+    Integer key = new Integer(ticket);
+    SocketSeeker seeker = waitingList.get(key);
+    seeker.acceptSocketFrom(doner);
+    waitingList.remove(key);
+  }
+
+  public synchronized boolean isWaiting(int ticket) {
+    return waitingList.containsKey(new Integer(ticket));
+  }
+}