From ca738e13e3ff83314992ef5b9fa3fbee11d74648 Mon Sep 17 00:00:00 2001
From: Felix Sidokhine <felix.sidokhine@randstad.ca>
Date: Sat, 30 May 2020 14:45:08 +0300
Subject: [PATCH] research in progress
---
jams-launcher/src/main/java/launcher/AppStarter.java | 1 +
.../src/main/java/net/jami/jams/server/core/TomcatLauncher.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/jams-launcher/src/main/java/launcher/AppStarter.java b/jams-launcher/src/main/java/launcher/AppStarter.java
index d19d7dd1..51c89bfc 100644
--- a/jams-launcher/src/main/java/launcher/AppStarter.java
+++ b/jams-launcher/src/main/java/launcher/AppStarter.java
@@ -87,6 +87,7 @@ public class AppStarter extends Thread {
}
if(doUpdate.get()){
Server.tomcatLauncher.stopTomcat();
+ server = null;
//This will trigger a force reload of the lib.
LibraryLoader.loadlibs(System.getProperty("user.dir"), AppStarter.class);
server = ServerLoader.loadServer(appUpdater, Integer.toString(port), serverCertificate, serverPrivateKey);
diff --git a/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java b/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java
index 0cfcaa3e..19b08ea0 100644
--- a/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java
+++ b/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java
@@ -51,7 +51,7 @@ import static net.jami.jams.server.Server.certificateAuthority;
@Slf4j
public class TomcatLauncher {
- private Tomcat tomcat = new Tomcat();
+ private final Tomcat tomcat = new Tomcat();
private Connector connector;
private StandardContext context;
--
GitLab