Commit: 25e309d6731ce6f98bf088192a10ae3712a1d114 - kryonetfork (hg)

Commit MetaInfo

• Revisão: 25e309d6731ce6f98bf088192a10ae3712a1d114 (tree)
• Hora: 2021-11-11 21:27:10
• Autor: sebastian_bugiu
• Commiter: sebastian_bugiu

Mensagem de Log

Reverted stupid bug because of robovm compiling stuff wrong.

Mudança Sumário

• modified: src/com/esotericsoftware/kryonet/Client.java
• modified: src/com/esotericsoftware/kryonet/Server.java

Diff

diff -r 30c9082e26f0 -r 25e309d6731c src/com/esotericsoftware/kryonet/Client.java
--- a/src/com/esotericsoftware/kryonet/Client.java	Sun Oct 24 20:30:54 2021 +0300
+++ b/src/com/esotericsoftware/kryonet/Client.java	Thu Nov 11 14:27:10 2021 +0200
@@ -353,7 +353,9 @@
 		shutdown = false;
 		while (!shutdown) {
 			try {
+//				System.out.println("Calling update");
 				update(250);
+//				System.out.println("Update called");
 			} catch (IOException ex) {
 				if (TRACE) {
 					if (isConnected)
@@ -409,17 +411,29 @@
 
 	public void close () {
 		super.close();
+//		System.out.println("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.
-		if (!isClosed) {
-			isClosed = true;
-			selector.wakeup();
-			try {
-				selector.selectNow();
-			} catch (IOException ignored) {
+
+			// Select one last time to complete closing the socket.
+			if (!isClosed) {
+				isClosed = true;
+//			System.out.println("Calling wakeup() from close()");
+				selector.wakeup();
+//			try {
+//				Thread.sleep(500);
+//			} catch (InterruptedException e) {
+//				e.printStackTrace();
+//			}
+				try {
+//				System.out.println("Calling selectNow() from close()");
+					selector.selectNow();
+//				System.out.println("Called selectNow() from close()");
+				} catch (IOException ignored) {
+					ignored.printStackTrace();
+				}
 			}
 		}
+//		System.out.println("Exiting close()");
 	}
 
 	/** Releases the resources used by this client, which may no longer be used. */

diff -r 30c9082e26f0 -r 25e309d6731c src/com/esotericsoftware/kryonet/Server.java
--- a/src/com/esotericsoftware/kryonet/Server.java	Sun Oct 24 20:30:54 2021 +0300
+++ b/src/com/esotericsoftware/kryonet/Server.java	Thu Nov 11 14:27:10 2021 +0200
@@ -575,12 +575,13 @@
 		}
 
 		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.
-		selector.wakeup();
-		try {
-			selector.selectNow();
-		} catch (IOException ignored) {
+
+			// Select one last time to complete closing the socket.
+			selector.wakeup();
+			try {
+				selector.selectNow();
+			} catch (IOException ignored) {
+			}
 		}
 	}