X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FCmsDeploymentImpl.java;h=0d53a09b090f2a33dedf5e500e5c164593675a54;hb=4f899ffcfd5652eb13748535353d2bd09f568bbc;hp=52f97fd8d4224d71a7fe9ec7c26a5bfd985b8d5e;hpb=01da06d541cdb4ad614579a37be64b5de900bc20;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java
index 52f97fd8d..0d53a09b0 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java
@@ -64,7 +64,10 @@ public class CmsDeploymentImpl implements CmsDeployment {
 	public void setHttpServer(HttpServer httpServer) {
 		Objects.requireNonNull(httpServer);
 		if (this.httpServer.isDone())
-			throw new IllegalStateException("HTTP server is already set");
+			if (httpExpected)
+				throw new IllegalStateException("HTTP server is already set");
+			else
+				return;// ignore
 		// create contexts whose handlers had already been published
 		synchronized (httpHandlers) {
 			synchronized (httpAuthenticators) {
@@ -107,7 +110,8 @@ public class CmsDeploymentImpl implements CmsDeployment {
 		}
 		if (!this.httpServer.isDone())
 			throw new IllegalStateException("HTTP server is not set");
-		HttpContext httpContext = httpServer.resultNow().createContext(contextPath);
+		// TODO use resultNow when switching to Java 21
+		HttpContext httpContext = httpServer.join().createContext(contextPath);
 		// we want to set the authenticator BEFORE the handler actually becomes active
 		httpContext.setAuthenticator(authenticator);
 		httpContext.setHandler(httpHandler);
@@ -121,7 +125,8 @@ public class CmsDeploymentImpl implements CmsDeployment {
 		httpHandlers.remove(contextPath);
 		if (!httpServer.isDone())
 			return;
-		httpServer.resultNow().removeContext(contextPath);
+		// TODO use resultNow when switching to Java 21
+		httpServer.join().removeContext(contextPath);
 		log.debug(() -> "Removed handler " + contextPath + " : " + httpHandler.getClass().getName());
 	}