From 7d68208e111e20ba69f27f548e2bc314c2ee4003 Mon Sep 17 00:00:00 2001
From: Wouter Gritter <wouter@gritter.nl>
Date: Fri, 22 May 2026 17:25:48 +0200
Subject: [PATCH] Always close HttpClient (#1798)

* Always close HttpClient (even on exception)

* Get rid of try/catch since we now use java 21
---
 .../connection/client/InitialLoginSessionHandler.java  | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/InitialLoginSessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/InitialLoginSessionHandler.java
index 482fb76e6..f6e1cd6e1 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/InitialLoginSessionHandler.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/InitialLoginSessionHandler.java
@@ -268,14 +268,8 @@ public class InitialLoginSessionHandler implements MinecraftSessionHandler {
               inbound.disconnect(Component.translatable("multiplayer.disconnect.authservers_down"));
             }
           }, mcConnection.eventLoop())
-          .thenRun(() -> {
-            try {
-              httpClient.close();
-            } catch (Exception e) {
-              // In Java 21, the HttpClient does not throw any Exception
-              // when trying to clean its resources, so this should not happen
-              logger.error("An unknown error occurred while trying to close an HttpClient", e);
-            }
+          .whenComplete((ignored, throwable) -> {
+            httpClient.close();
           });
     } catch (GeneralSecurityException e) {
       logger.error("Unable to enable encryption", e);