Fixed deadlock in EndPoint#close().

closes #93
EsotericSoftware · May 8, 2015 · a7e9661 · Teiby1 · Feb 15, 2016 · a7e9661
1 parent 7d6cf16
commit a7e9661
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/com/esotericsoftware/kryonet/Client.java b/src/com/esotericsoftware/kryonet/Client.java
@@ -405,15 +405,15 @@ public void stop () {
 
 	public void close () {
 		super.close();
+		synchronized (updateLock) { // Blocks to avoid a select while the selector is used to bind the server connection.
+		}
 		// Select one last time to complete closing the socket.
-		synchronized (updateLock) {
-			if (!isClosed) {
-				isClosed = true;
-				selector.wakeup();
-				try {
-					selector.selectNow();
-				} catch (IOException ignored) {
-				}
+		if (!isClosed) {
+			isClosed = true;
+			selector.wakeup();
+			try {
+				selector.selectNow();
+			} catch (IOException ignored) {
 			}
 		}
 	}

diff --git a/src/com/esotericsoftware/kryonet/Server.java b/src/com/esotericsoftware/kryonet/Server.java
@@ -573,13 +573,13 @@ public void close () {
 			this.udp = null;
 		}
 
+		synchronized (updateLock) { // Blocks to avoid a select while the selector is used to bind the server connection.
+		}
 		// Select one last time to complete closing the socket.
-		synchronized (updateLock) {
-			selector.wakeup();
-			try {
-				selector.selectNow();
-			} catch (IOException ignored) {
-			}
+		selector.wakeup();
+		try {
+			selector.selectNow();
+		} catch (IOException ignored) {
 		}
 	}