Improve initialisation

[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 265cb34a073b4443d65316f74749332d54b67695..e1c420b8287469bb698af791d04b9d87638563d9 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
@@ -82,7 +82,7 @@ public class CmsDeploymentImpl implements CmsDeployment {
                CmsAuthenticator authenticator = isPublic ? new PublicCmsAuthenticator() : new CmsAuthenticator();
                httpHandlers.put(contextPath, httpHandler);
                httpAuthenticators.put(contextPath, authenticator);
-               if (httpServer == null) {
+               if (httpServer.join() == null) {
                        return;
                } else {
                        createHttpContext(contextPath, httpHandler, authenticator);
@@ -90,6 +90,11 @@ public class CmsDeploymentImpl implements CmsDeployment {
        }
 
        public void createHttpContext(String contextPath, HttpHandler httpHandler, CmsAuthenticator authenticator) {
+               if (!httpExpected) {
+                       if (log.isTraceEnabled())
+                               log.warn("Ignore HTTP context " + contextPath + " as we don't provide an HTTP server");
+                       return;
+               }
                HttpContext httpContext = httpServer.join().createContext(contextPath);
                // we want to set the authenticator BEFORE the handler actually becomes active
                httpContext.setAuthenticator(authenticator);
@@ -102,16 +107,16 @@ public class CmsDeploymentImpl implements CmsDeployment {
                if (contextPath == null)
                        return; // ignore silently
                httpHandlers.remove(contextPath);
-               if (httpServer == null)
+               if (httpServer.join() == null)
                        return;
                httpServer.join().removeContext(contextPath);
                log.debug(() -> "Removed handler " + contextPath + " : " + httpHandler.getClass().getName());
        }
 
        public boolean allExpectedServicesAvailable() {
-               if (httpExpected && httpServer == null)
+               if (httpExpected && !httpServer.isDone())
                        return false;
-               if (sshdExpected && cmsSshd == null)
+               if (sshdExpected && !cmsSshd.isDone())
                        return false;
                return true;
        }