From 11578b817d24035f0211be145167bc9875911524 Mon Sep 17 00:00:00 2001
From: nathan <nathan@dorkbox.com>
Date: Tue, 22 Jan 2019 14:41:40 +0100
Subject: [PATCH] Fixed threading deadlock issues in some circumstances

---
 test/dorkbox/network/BaseTest.java | 72 +++++++++++++++---------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/test/dorkbox/network/BaseTest.java b/test/dorkbox/network/BaseTest.java
index 8061b361..16b0e50e 100644
--- a/test/dorkbox/network/BaseTest.java
+++ b/test/dorkbox/network/BaseTest.java
@@ -178,44 +178,44 @@ class BaseTest {
 
         this.fail_check = false;
 
-        synchronized (this.endPointConnections) {
-            Thread thread = null;
-            if (!this.endPointConnections.isEmpty()) {
-                // make sure to run this thread in the MAIN thread group..
-                ThreadGroup threadGroup = Thread.currentThread()
-                                                .getThreadGroup();
-                if (threadGroup.getName()
-                               .contains(THREADGROUP_NAME)) {
-                    threadGroup = threadGroup.getParent();
-                }
-
-                thread = new Thread(threadGroup, new Runnable() {
-                    @Override
-                    public
-                    void run() {
-                        // not the best, but this works for our purposes. This is a TAD hacky, because we ALSO have to make sure that we
-                        // ARE NOT in the same thread group as netty!
-                        try {
-                            if (stopAfterMillis > 0L) {
-                                // if we specify a time, then we stop, otherwise we wait the timeout.
-                                Thread.sleep(stopAfterMillis);
-                            }
-                            else {
-                                Thread.sleep(120 * 1000L); // wait minimum of 2 minutes before we automatically fail the unit test.
-                            }
-
-                            System.err.println("Test did not complete in a timely manner...");
-                            BaseTest.this.fail_check = true;
-                            stopEndPoints();
-                        } catch (InterruptedException ignored) {
-                        }
-                    }
-                }, "UnitTest timeout fail condition");
-                thread.setDaemon(true);
-                thread.start();
+        Thread thread = null;
+        if (!this.endPointConnections.isEmpty()) {
+            // make sure to run this thread in the MAIN thread group..
+            ThreadGroup threadGroup = Thread.currentThread()
+                                            .getThreadGroup();
+            if (threadGroup.getName()
+                           .contains(THREADGROUP_NAME)) {
+                threadGroup = threadGroup.getParent();
             }
 
-            while (!this.endPointConnections.isEmpty()) {
+            thread = new Thread(threadGroup, new Runnable() {
+                @Override
+                public
+                void run() {
+                    // not the best, but this works for our purposes. This is a TAD hacky, because we ALSO have to make sure that we
+                    // ARE NOT in the same thread group as netty!
+                    try {
+                        if (stopAfterMillis > 0L) {
+                            // if we specify a time, then we stop, otherwise we wait the timeout.
+                            Thread.sleep(stopAfterMillis);
+                        }
+                        else {
+                            Thread.sleep(120 * 1000L); // wait minimum of 2 minutes before we automatically fail the unit test.
+                        }
+
+                        System.err.println("Test did not complete in a timely manner...");
+                        BaseTest.this.fail_check = true;
+                        stopEndPoints();
+                    } catch (InterruptedException ignored) {
+                    }
+                }
+            }, "UnitTest timeout fail condition");
+            thread.setDaemon(true);
+            thread.start();
+        }
+
+        while (!this.endPointConnections.isEmpty()) {
+            synchronized (this.endPointConnections) {
                 try {
                     this.endPointConnections.wait(stopAfterMillis);
                 } catch (InterruptedException e) {