1 files changed, 5 insertions, 2 deletions
diff --git a/branches/1.x_Branch/src/main/java/org/mockftpserver/stub/StubFtpServer.java b/branches/1.x_Branch/src/main/java/org/mockftpserver/stub/StubFtpServer.java
index b69e7a0..d297326 100644
--- a/branches/1.x_Branch/src/main/java/org/mockftpserver/stub/StubFtpServer.java
+++ b/branches/1.x_Branch/src/main/java/org/mockftpserver/stub/StubFtpServer.java
@@ -209,11 +209,14 @@ public final class StubFtpServer implements Runnable {
      */
     public void start() {
         serverThread = new Thread(this);
-        serverThread.start();
-        
+
         // Wait until the thread is initialized
         synchronized(startLock){ 
             try {
+                // Start here in case server thread runs faster than main thread.
+                // See https://sourceforge.net/tracker/?func=detail&atid=1006533&aid=1925590&group_id=208647
+                serverThread.start();
+
                 startLock.wait();
             }
             catch (InterruptedException e) {