From a702171613f7652cb978a56d77f028a39628ca8b Mon Sep 17 00:00:00 2001
From: Felix Sidokhine <felix.sidokhine@randstad.ca>
Date: Sat, 30 May 2020 19:12:36 +0300
Subject: [PATCH] fixed a context loading issue
---
jams-launcher/src/main/java/launcher/AppStarter.java | 1 -
jams-server/src/main/java/net/jami/jams/server/Server.java | 1 -
.../main/java/net/jami/jams/server/core/TomcatLauncher.java | 4 ++--
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/jams-launcher/src/main/java/launcher/AppStarter.java b/jams-launcher/src/main/java/launcher/AppStarter.java
index 51c89bfc..d19d7dd1 100644
--- a/jams-launcher/src/main/java/launcher/AppStarter.java
+++ b/jams-launcher/src/main/java/launcher/AppStarter.java
@@ -87,7 +87,6 @@ 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/Server.java b/jams-server/src/main/java/net/jami/jams/server/Server.java
index 34e3f1a8..a740c751 100644
--- a/jams-server/src/main/java/net/jami/jams/server/Server.java
+++ b/jams-server/src/main/java/net/jami/jams/server/Server.java
@@ -55,7 +55,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
@Slf4j
//In order to make this "stoppable" to simply, I turned the server itself into a thread.
-//The reasoning: the main two problems
public class Server {
public final static AtomicBoolean isInstalled = new AtomicBoolean(false);
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 9ece9ab4..06461326 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
@@ -52,8 +52,8 @@ import static net.jami.jams.server.Server.certificateAuthority;
@Slf4j
public class TomcatLauncher {
- private static final Tomcat tomcat = new Tomcat();
- private static StandardContext context;
+ private final Tomcat tomcat = new Tomcat();
+ private StandardContext context;
public TomcatLauncher(int port) {
tomcat.getService().addConnector(TomcatConnectorFactory.getNoSSLConnector(port));
--
GitLab