Fix bug on closing GPGNet socket right away

FAForever · Dec 9, 2024 · 10be8db · 10be8db
1 parent c67dff3
commit 10be8db
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/ice-adapter/src/main/java/com/faforever/iceadapter/gpgnet/GPGNetServer.java b/ice-adapter/src/main/java/com/faforever/iceadapter/gpgnet/GPGNetServer.java
@@ -68,8 +68,8 @@ public void init(int gpgnetPort, int lobbyPort) {
             log.info("Using LOBBY_PORT: {}", this.lobbyPort);
         }
 
-        try (ServerSocket Socket = new ServerSocket(gpgnetPort)) {
-            this.serverSocket = Socket;
+        try {
+            this.serverSocket = new ServerSocket(gpgnetPort);
         } catch (IOException e) {
             log.error("Couldn't start GPGNetServer", e);
             IceAdapter.close(-1);
@@ -241,7 +241,11 @@ private void onGpgnetConnectionLost() {
     private void acceptThread() {
         while (!Thread.currentThread().isInterrupted()) {
             log.info("Listening for incoming connections from game");
-            try (Socket socket = serverSocket.accept()) {
+            try {
+                // The socket declaration must not be moved into a try-with-resources block, as the socket must not be
+                // closed. It is passed into the GPGNetClient.
+                Socket socket = serverSocket.accept();
+
                 LockUtil.executeWithLock(lockSocket, () -> {
                     if (currentClient != null) {
                         onGpgnetConnectionLost();