X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FCmsDeploymentImpl.java;h=d3f4b575aa7ff6486f5708a7fbfa93728af4bb8c;hb=f92ba77466d18fcd0e7a9386ae0f16b530337f9f;hp=0d53a09b090f2a33dedf5e500e5c164593675a54;hpb=d297ee2399cf6e06b9dcfa0267521781f3559ec6;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 0d53a09b0..d3f4b575a 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
@@ -123,7 +123,7 @@ public class CmsDeploymentImpl implements CmsDeployment {
 		if (contextPath == null)
 			return; // ignore silently
 		httpHandlers.remove(contextPath);
-		if (!httpServer.isDone())
+		if (!httpExpected || !httpServer.isDone())
 			return;
 		// TODO use resultNow when switching to Java 21
 		httpServer.join().removeContext(contextPath);