From 32ee72d58d07e94015797fc0c0a3da389a4f6e37 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Sat, 11 Oct 2025 12:37:48 -0400
Subject: [PATCH] Fix eepsite start via /configclients

---
 apps/jetty/java/src/net/i2p/jetty/JettyStart.java | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/apps/jetty/java/src/net/i2p/jetty/JettyStart.java b/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
index 8b8005d2b..4aebef446 100644
--- a/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
+++ b/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
@@ -81,7 +81,19 @@ public class JettyStart implements ClientApp {
         _args = args;
         _jettys = new ArrayList<LifeCycle>(args.length);
         _context = context;
-        parseArgs(args);
+        // To prevent console WebAppClassLoader from interfering
+        // by hiding jetty classses
+        // when an eepsite is started from /configclients
+        ClassLoader cl1 = ClassLoader.getSystemClassLoader();
+        ClassLoader cl2 = Thread.currentThread().getContextClassLoader();
+        if (cl1 != cl2)
+            Thread.currentThread().setContextClassLoader(cl1);
+        try {
+            parseArgs(args);
+        } finally {
+            if (cl1 != cl2)
+                Thread.currentThread().setContextClassLoader(cl2);
+        }
         _state = INITIALIZED;
     }