From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 7 Jan 2020 07:59:32 +0000 (+0100)
Subject: Make Jetty restart when OSGi configuration is not cleaned up.
X-Git-Tag: argeo-commons-2.1.85~36
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=4835aba6de0e6e2f7ef2da9e3bd19adca661c8bc

Make Jetty restart when OSGi configuration is not cleaned up.
---

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java
index 4a75f519d..8bdf00ceb 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java
@@ -153,6 +153,9 @@ class DeployConfig implements ConfigurationListener {
 			tryGettyJetty: while (tryCount > 0) {
 				try {
 					JettyConfigurator.startServer(KernelConstants.DEFAULT_JETTY_SERVER, webServerConfig);
+					// Explicitly starts Jetty OSGi HTTP bundle, so that it gets triggered if OSGi
+					// configuration is not cleaned
+					FrameworkUtil.getBundle(JettyConfigurator.class).start();
 					break tryGettyJetty;
 				} catch (IllegalStateException e) {
 					// Jetty may not be ready