From 7a962857538396a047156c815c69e8006c1ec0c4 Mon Sep 17 00:00:00 2001
From: Felix Sidokhine <felix.sidokhine@randstad.ca>
Date: Sat, 30 May 2020 14:28:25 +0300
Subject: [PATCH] more cleaning up
---
jams-launcher/src/main/java/launcher/AppStarter.java | 1 -
jams-server/src/main/java/net/jami/jams/server/Server.java | 2 +-
.../src/main/java/net/jami/jams/server/core/TomcatLauncher.java | 2 --
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/jams-launcher/src/main/java/launcher/AppStarter.java b/jams-launcher/src/main/java/launcher/AppStarter.java
index c91ad52b..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();
- LibraryLoader.classLoader.destroy();
//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 4d7b439d..536f915d 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
@@ -77,7 +77,7 @@ public class Server {
}
- public void main(String[] args) {
+ public static void main(String[] args) {
//Start tomcat.
switch (args.length) {
case 0:
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 6d440e06..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
@@ -125,9 +125,7 @@ public class TomcatLauncher {
synchronized (tomcat) {
certificateAuthority.shutdownThreads();
tomcat.stop();
- context.destroy();
tomcat.destroy();
- LibraryLoader.classLoader.destroy();
}
} catch (Exception e) {
log.info("Failed to stop tomcat server with error {}", e.getMessage());
--
GitLab