X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FCmsDeploymentImpl.java;h=e1c420b8287469bb698af791d04b9d87638563d9;hb=091d43fef5f8e88c7081340138eb1bb33c5862a2;hp=f9a1dc36832dab593fb28d53017679f8db5f400c;hpb=c7eb04e5cd6049c24b347a56f3c80484d329e2bc;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 f9a1dc368..e1c420b82 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
@@ -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);
@@ -107,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;
 	}