X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.lib.jetty%2Fsrc%2Forg%2Fargeo%2Fcms%2Fjetty%2FJettyHttpServer.java;h=74f0aaed3d8ddeb3154585386f15a5968d8c54eb;hb=221681f8ac70c35e54690a42fea73319a43deb06;hp=98975c3c843ad7c152a4c1815f738a812c6ca130;hpb=e7c9d17e8277bf8df7404d511a9f83f0626ded38;p=lgpl%2Fargeo-commons.git

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 98975c3c8..74f0aaed3 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
@@ -16,6 +16,7 @@ import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.CmsState;
 import org.argeo.cms.CmsDeployProperty;
 import org.argeo.cms.http.server.HttpServerUtils;
+import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
 import org.eclipse.jetty.http.UriCompliance;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
@@ -24,7 +25,6 @@ import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SslConnectionFactory;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
-import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.util.thread.ExecutorThreadPool;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
@@ -278,7 +278,8 @@ public class JettyHttpServer extends HttpsServer {
 		JettyHttpContext httpContext = contexts.remove(path);
 		if (httpContext instanceof ContextHandlerHttpContext contextHandlerHttpContext) {
 			// TODO stop handler first?
-			contextHandlerCollection.removeHandler(contextHandlerHttpContext.getServletContextHandler());
+			// FIXME understand compatibility with Jetty 12
+			//contextHandlerCollection.removeHandler(contextHandlerHttpContext.getServletContextHandler());
 		} else {
 			// FIXME apparently servlets cannot be removed in Jetty, we should replace the
 			// handler