X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FCmsDeployment.java;h=20418ec4d21e803890e838abdfaec1b092a24337;hb=aa3eae8ed83ae3b8b3cc98826ee02d121795cb60;hp=30d283c580583ed090df96b2694ad093bd414b89;hpb=09d97fb1d28c9bbe4b2ec9fc511adf5127a256c1;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java
index 30d283c58..20418ec4d 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java
@@ -34,6 +34,7 @@ import org.argeo.node.security.CryptoKeyring;
 import org.argeo.node.security.Keyring;
 import org.argeo.osgi.useradmin.UserAdminConf;
 import org.argeo.util.LangUtils;
+import org.eclipse.equinox.http.jetty.JettyConfigurator;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
@@ -192,6 +193,13 @@ public class CmsDeployment implements NodeDeployment {
 	public void shutdown() {
 		if (nodeHttp != null)
 			nodeHttp.destroy();
+
+		try {
+			JettyConfigurator.stopServer(KernelConstants.DEFAULT_JETTY_SERVER);
+		} catch (Exception e) {
+			log.error("Cannot stop default Jetty server.", e);
+		}
+
 		if (deployConfig != null) {
 			new Thread(() -> deployConfig.save(), "Save Argeo Deploy Config").start();
 		}