From 8356b20a3b2cb029ead638a667d6fb5366f1cf10 Mon Sep 17 00:00:00 2001
From: nathan <nathan@dorkbox.com>
Date: Fri, 8 May 2020 17:08:39 +0200
Subject: [PATCH] Fixed shutdown order when stopping tests (clients shutdown
 before servers)

---
 test/dorkbox/network/BaseTest.java | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/test/dorkbox/network/BaseTest.java b/test/dorkbox/network/BaseTest.java
index 41480e30..a3517ff8 100644
--- a/test/dorkbox/network/BaseTest.java
+++ b/test/dorkbox/network/BaseTest.java
@@ -197,12 +197,23 @@ class BaseTest {
         synchronized (lock) {
         }
 
-        for (EndPoint endPointConnection : this.endPointConnections) {
+        // shutdown clients first
+        for (EndPoint endPoint : this.endPointConnections) {
+            if (endPoint.getType() == Client.class) {
+                endPoint.stop();
+                endPoint.waitForShutdown();
 
-            endPointConnection.stop();
-            endPointConnection.waitForShutdown();
+                latch.countDown();
+            }
+        }
+        // shutdown servers last
+        for (EndPoint endPoint : this.endPointConnections) {
+            if (endPoint.getType() == Server.class) {
+                endPoint.stop();
+                endPoint.waitForShutdown();
 
-            latch.countDown();
+                latch.countDown();
+            }
         }
 
         // we start with "1", so make sure to end it