From ce6f04bdc72b998e5ca4231efc39f4e45764876c Mon Sep 17 00:00:00 2001
From: Samuel Carlsson <samuel.carlsson@gmail.com>
Date: Tue, 2 Aug 2016 20:32:59 +0200
Subject: [PATCH 1/2] Fixing a race condition in socket server

- This caused the mocked test cases to sometimes hang.
- Was particularly noticeable when running with code coverage.
---
 src/se/vidstige/jadb/server/SocketServer.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/se/vidstige/jadb/server/SocketServer.java b/src/se/vidstige/jadb/server/SocketServer.java
index a44f832..f0dd880 100644
--- a/src/se/vidstige/jadb/server/SocketServer.java
+++ b/src/se/vidstige/jadb/server/SocketServer.java
@@ -10,6 +10,8 @@ public abstract class SocketServer implements Runnable {
     private final int port;
     private ServerSocket socket;
     private Thread thread;
+
+    private boolean isStarted = false;
     private final Object lockObject = new Object();
 
     protected SocketServer(int port) {
@@ -21,7 +23,9 @@ public abstract class SocketServer implements Runnable {
         thread.setDaemon(true);
         thread.start();
         synchronized (lockObject) {
-            lockObject.wait();
+            if (!isStarted) {
+                lockObject.wait();
+            }
         }
     }
 
@@ -37,6 +41,7 @@ public abstract class SocketServer implements Runnable {
 
             synchronized (lockObject) {
                 lockObject.notify();
+                isStarted = true;
             }
 
             while (true) {

From c2acf534ff60d8c84476b8baab31ebe4221eb9d2 Mon Sep 17 00:00:00 2001
From: Samuel Carlsson <samuel.carlsson@gmail.com>
Date: Tue, 2 Aug 2016 21:52:34 +0200
Subject: [PATCH 2/2] Refactor: Moving out methods for clarity.

---
 src/se/vidstige/jadb/server/SocketServer.java | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/se/vidstige/jadb/server/SocketServer.java b/src/se/vidstige/jadb/server/SocketServer.java
index f0dd880..a56f1be 100644
--- a/src/se/vidstige/jadb/server/SocketServer.java
+++ b/src/se/vidstige/jadb/server/SocketServer.java
@@ -22,11 +22,7 @@ public abstract class SocketServer implements Runnable {
         thread = new Thread(this, "Fake Adb Server");
         thread.setDaemon(true);
         thread.start();
-        synchronized (lockObject) {
-            if (!isStarted) {
-                lockObject.wait();
-            }
-        }
+        serverReady();
     }
 
     public int getPort() {
@@ -39,10 +35,7 @@ public abstract class SocketServer implements Runnable {
             socket = new ServerSocket(port);
             socket.setReuseAddress(true);
 
-            synchronized (lockObject) {
-                lockObject.notify();
-                isStarted = true;
-            }
+            waitForServer();
 
             while (true) {
                 Socket c = socket.accept();
@@ -54,6 +47,21 @@ public abstract class SocketServer implements Runnable {
         }
     }
 
+    private void serverReady() throws InterruptedException {
+        synchronized (lockObject) {
+            if (!isStarted) {
+                lockObject.wait();
+            }
+        }
+    }
+
+    private void waitForServer() {
+        synchronized (lockObject) {
+            lockObject.notify();
+            isStarted = true;
+        }
+    }
+
     protected abstract Runnable createResponder(Socket socket);
 
     public void stop() throws IOException, InterruptedException {