Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-17 18:51:10 +01:00
Code Issues Packages Projects Releases Activity

remove MBeanCleanUp step to avoid exception on restart

Browse Source
This commit is contained in:
Sebastian Sdorra
2019-06-20 15:09:12 +02:00
parent d658a1a662
commit eec4b282e6
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-webapp/src/main/java/sonia/scm/boot/ClassLoaderLifeCycle.java
View File

@@ -5,6 +5,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import se.jiderhamn.classloader.leak.prevention.ClassLoaderLeakPreventor; import se.jiderhamn.classloader.leak.prevention.ClassLoaderLeakPreventor;
import se.jiderhamn.classloader.leak.prevention.ClassLoaderLeakPreventorFactory; import se.jiderhamn.classloader.leak.prevention.ClassLoaderLeakPreventorFactory;
import se.jiderhamn.classloader.leak.prevention.cleanup.MBeanCleanUp;
import sonia.scm.plugin.ChildFirstPluginClassLoader; import sonia.scm.plugin.ChildFirstPluginClassLoader;
import sonia.scm.plugin.DefaultPluginClassLoader; import sonia.scm.plugin.DefaultPluginClassLoader;
@@ -36,6 +37,7 @@ public final class ClassLoaderLifeCycle {
public static ClassLoaderLifeCycle create() { public static ClassLoaderLifeCycle create() {
ClassLoaderLeakPreventorFactory classLoaderLeakPreventorFactory = new ClassLoaderLeakPreventorFactory(); ClassLoaderLeakPreventorFactory classLoaderLeakPreventorFactory = new ClassLoaderLeakPreventorFactory();
classLoaderLeakPreventorFactory.setLogger(new LoggingAdapter()); classLoaderLeakPreventorFactory.setLogger(new LoggingAdapter());
classLoaderLeakPreventorFactory.removeCleanUp(MBeanCleanUp.class);
return new ClassLoaderLifeCycle(Thread.currentThread().getContextClassLoader(), classLoaderLeakPreventorFactory); return new ClassLoaderLifeCycle(Thread.currentThread().getContextClassLoader(), classLoaderLeakPreventorFactory);
} }

1
scm-webapp/src/main/java/sonia/scm/boot/LoggingAdapter.java
View File

@@ -9,6 +9,7 @@ import se.jiderhamn.classloader.leak.prevention.ClassLoaderLeakPreventor;
*/ */
public class LoggingAdapter implements se.jiderhamn.classloader.leak.prevention.Logger { public class LoggingAdapter implements se.jiderhamn.classloader.leak.prevention.Logger {
@SuppressWarnings("squid:S3416") // suppress "loggers should be named for their enclosing classes" rule
private static final Logger LOG = LoggerFactory.getLogger(ClassLoaderLeakPreventor.class); private static final Logger LOG = LoggerFactory.getLogger(ClassLoaderLeakPreventor.class);
@Override @Override