Index: src/opal/transports.cxx
===================================================================
--- src/opal/transports.cxx (revision 21261)
+++ src/opal/transports.cxx (working copy)
@@ -576,22 +576,16 @@ PBoolean OpalListenerTCP::Open(const PNo
     return StartThread(theAcceptHandler, mode);
   }
 
-  if (listener.Listen(localAddress, 1, listenerPort))
-    return StartThread(theAcceptHandler, mode);
-
   if (exclusiveListener) {
+      if (listener.Listen(localAddress, 10, listenerPort))
+          return StartThread(theAcceptHandler, mode);
+
     PTRACE(1, "Listen\tOpen on " << localAddress << ':' << listener.GetPort()
            << " failed: " << listener.GetErrorText());
     return PFalse;
   }
 
-  if (listener.GetErrorNumber() != EADDRINUSE)
-    return PFalse;
-
-  PTRACE(1, "Listen\tSocket for " << localAddress << ':' << listener.GetPort()
-         << " already in use, incoming connections may not all be serviced!");
-
-  if (listener.Listen(localAddress, 100, 0, PSocket::CanReuseAddress))
+  if (listener.Listen(localAddress, 10, listenerPort, PSocket::CanReuseAddress))
     return StartThread(theAcceptHandler, mode);
 
   PTRACE(1, "Listen\tOpen (REUSEADDR) on " << localAddress << ':' << listener.GetPort()