From 9f4ee8be1c272ee5ece89d88b77179b9d470dea5 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 24 Sep 2023 11:34:03 +0200 Subject: [PATCH] Document problems with unregistering HTTP handler --- .../src/org/argeo/cms/jetty/JettyHttpServer.java | 3 +++ .../src/org/argeo/cms/jetty/ServletHttpContext.java | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/JettyHttpServer.java b/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/JettyHttpServer.java index a469a87c4..1254781e8 100644 --- a/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/JettyHttpServer.java +++ b/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/JettyHttpServer.java @@ -267,6 +267,9 @@ public class JettyHttpServer extends HttpsServer { if (httpContext instanceof ContextHandlerHttpContext contextHandlerHttpContext) { // TODO stop handler first? contextHandlerCollection.removeHandler(contextHandlerHttpContext.getServletContextHandler()); + } else { + // FIXME apparently servlets cannot be removed in Jetty, we should replace the + // handler } } diff --git a/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/ServletHttpContext.java b/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/ServletHttpContext.java index 33611941d..b2a472b44 100644 --- a/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/ServletHttpContext.java +++ b/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/ServletHttpContext.java @@ -6,7 +6,6 @@ import java.util.Map; import javax.websocket.DeploymentException; import javax.websocket.server.ServerContainer; -import javax.websocket.server.ServerEndpointConfig; import org.argeo.api.cms.CmsLog; import org.argeo.cms.servlet.httpserver.HttpContextServlet; -- 2.30.2