Working multi RCP platform

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / runtime / CmsDeploymentImpl.java

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 52f97fd8d4224d71a7fe9ec7c26a5bfd985b8d5e..d3f4b575aa7ff6486f5708a7fbfa93728af4bb8c 100644 (file)
--- 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);
@@ -119,9 +123,10 @@ public class CmsDeploymentImpl implements CmsDeployment {
                if (contextPath == null)
                        return; // ignore silently
                httpHandlers.remove(contextPath);
-               if (!httpServer.isDone())
+               if (!httpExpected || !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());
        }