3 files changed, 13 insertions, 3 deletions
diff --git a/branches/1.x_Branch/CHANGELOG.txt b/branches/1.x_Branch/CHANGELOG.txt
index df146b7..d094794 100644
--- a/branches/1.x_Branch/CHANGELOG.txt
+++ b/branches/1.x_Branch/CHANGELOG.txt
@@ -1,6 +1,13 @@
 MockFtpServer Change Log
 -------------------------------------------------------------------------------
 
+Changes in version 1.2.2 (27 May 2008)
+------------------------------------------
+- BUG FIX: Move serverThread.start() into synchronized block to avoid server hang if 
+  server thread runs faster than main thread. 
+  See https://sourceforge.net/tracker/?func=detail&atid=1006533&aid=1925590&group_id=208647
+
+
 Changes in version 1.2.1 (10 Mar 2008)
 ------------------------------------------
 - Change Maven POM (pom.xml) to enable sync-ing with central Maven repository (ibiblio).
diff --git a/branches/1.x_Branch/pom.xml b/branches/1.x_Branch/pom.xml
index 08ab06c..6712e48 100644
--- a/branches/1.x_Branch/pom.xml
+++ b/branches/1.x_Branch/pom.xml
@@ -9,7 +9,7 @@
 	or failure scenarios. You can also verify expected command invocations. 
   </description>
   <packaging>jar</packaging>
-  <version>1.2.1</version>
+  <version>1.2.2</version>
   <url>http://mockftpserver.sourceforge.net/</url>
 
   <scm>
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) {