Skip to content
Snippets Groups Projects
Commit a7021716 authored by Felix Sidokhine's avatar Felix Sidokhine
Browse files

fixed a context loading issue

parent db889d33
No related branches found
No related tags found
No related merge requests found
...@@ -87,7 +87,6 @@ public class AppStarter extends Thread { ...@@ -87,7 +87,6 @@ public class AppStarter extends Thread {
} }
if(doUpdate.get()){ if(doUpdate.get()){
Server.tomcatLauncher.stopTomcat(); Server.tomcatLauncher.stopTomcat();
server = null;
//This will trigger a force reload of the lib. //This will trigger a force reload of the lib.
LibraryLoader.loadlibs(System.getProperty("user.dir"), AppStarter.class); LibraryLoader.loadlibs(System.getProperty("user.dir"), AppStarter.class);
server = ServerLoader.loadServer(appUpdater, Integer.toString(port), serverCertificate, serverPrivateKey); server = ServerLoader.loadServer(appUpdater, Integer.toString(port), serverCertificate, serverPrivateKey);
......
...@@ -55,7 +55,6 @@ import java.util.concurrent.atomic.AtomicBoolean; ...@@ -55,7 +55,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
@Slf4j @Slf4j
//In order to make this "stoppable" to simply, I turned the server itself into a thread. //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 class Server {
public final static AtomicBoolean isInstalled = new AtomicBoolean(false); public final static AtomicBoolean isInstalled = new AtomicBoolean(false);
......
...@@ -52,8 +52,8 @@ import static net.jami.jams.server.Server.certificateAuthority; ...@@ -52,8 +52,8 @@ import static net.jami.jams.server.Server.certificateAuthority;
@Slf4j @Slf4j
public class TomcatLauncher { public class TomcatLauncher {
private static final Tomcat tomcat = new Tomcat(); private final Tomcat tomcat = new Tomcat();
private static StandardContext context; private StandardContext context;
public TomcatLauncher(int port) { public TomcatLauncher(int port) {
tomcat.getService().addConnector(TomcatConnectorFactory.getNoSSLConnector(port)); tomcat.getService().addConnector(TomcatConnectorFactory.getNoSSLConnector(port));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment