From: Mathieu Baudier Date: Sat, 29 Jun 2019 12:14:13 +0000 (+0200) Subject: Fix regression after introduction of web sockets, when an HTTP server is X-Git-Tag: argeo-commons-2.1.78~19 X-Git-Url: http://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=55223e8915648993b005bc6ea5d2eea358898c8c Fix regression after introduction of web sockets, when an HTTP server is not available. --- 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 4db887606..3cce7e821 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 @@ -122,10 +122,10 @@ class DeployConfig implements ConfigurationListener { // http server Dictionary webServerConfig = InitUtils .getHttpServerConfig(getProps(KernelConstants.JETTY_FACTORY_PID, NodeConstants.DEFAULT)); - webServerConfig.put("customizer.class", "org.argeo.equinox.jetty.WebSocketJettyCustomizer"); - if (!webServerConfig.isEmpty()) + if (!webServerConfig.isEmpty()) { + webServerConfig.put("customizer.class", "org.argeo.equinox.jetty.WebSocketJettyCustomizer"); putFactoryDeployConfig(KernelConstants.JETTY_FACTORY_PID, webServerConfig); - + } save(); }