Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-14 09:25:43 +01:00
Code Issues Packages Projects Releases Activity

move Resteasy cleanup into the ResteasyAllInOneServletDispatcher

Browse Source
This commit is contained in:
Sebastian Sdorra
2019-06-25 08:31:49 +02:00
parent 9662b8a00b
commit 56c7fcc114
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-webapp/src/main/java/sonia/scm/ResteasyAllInOneServletDispatcher.java
View File

@@ -15,6 +15,7 @@ import javax.inject.Singleton;
import javax.servlet.ServletConfig; import javax.servlet.ServletConfig;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.ws.rs.ext.RuntimeDelegate;
/** /**
* Resteasy initialization and dispatching. This servlet combines the initialization of * Resteasy initialization and dispatching. This servlet combines the initialization of
@@ -66,5 +67,10 @@ public class ResteasyAllInOneServletDispatcher extends HttpServletDispatcher {
LOG.info("destroy resteasy"); LOG.info("destroy resteasy");
super.destroy(); super.destroy();
deployment.stop(); deployment.stop();
// ensure everything gets cleared, to avoid classloader leaks
ResteasyProviderFactory.clearInstanceIfEqual(ResteasyProviderFactory.getInstance());
ResteasyProviderFactory.clearContextData();
RuntimeDelegate.setInstance(null);
} }
} }

4
scm-webapp/src/main/java/sonia/scm/boot/ServletContextCleaner.java
View File

@@ -49,9 +49,7 @@ final class ServletContextCleaner {
} }
} }
ResteasyProviderFactory.clearInstanceIfEqual(ResteasyProviderFactory.getInstance());
ResteasyProviderFactory.clearContextData();
RuntimeDelegate.setInstance(null);
} }
private static boolean shouldRemove(String name) { private static boolean shouldRemove(String name) {