From 7e006e08dd9ae0b56933aea453965ef1acfe42a9 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 18 Jun 2013 17:11:23 -0700 Subject: [PATCH] Touching up on the fix by ikedam --- .../org/jvnet/hudson/test/TestPluginManager.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/test/src/main/java/org/jvnet/hudson/test/TestPluginManager.java b/test/src/main/java/org/jvnet/hudson/test/TestPluginManager.java index 9fd35959a8..9ead9ecc87 100644 --- a/test/src/main/java/org/jvnet/hudson/test/TestPluginManager.java +++ b/test/src/main/java/org/jvnet/hudson/test/TestPluginManager.java @@ -121,6 +121,14 @@ public class TestPluginManager extends PluginManager { p.stop(); } + /** + * As we don't actually shut down classloaders, we instead provide this method that does + * what {@link #stop()} normally does. + */ + private void reallyStop() { + super.stop(); + } + private static final Logger LOGGER = Logger.getLogger(TestPluginManager.class.getName()); static { @@ -129,13 +137,11 @@ public class TestPluginManager extends PluginManager { Runtime.getRuntime().addShutdownHook(new Thread("delete " + INSTANCE.rootDir) { @Override public void run() { // Shutdown and release plugins as in PluginManager#stop - for(PluginWrapper p: INSTANCE.getPlugins()) { - p.stop(); - p.releaseClassLoader(); - } - INSTANCE.getPlugins().clear(); + ((TestPluginManager)INSTANCE).reallyStop(); + // allow JVM cleanup handles of jar files... System.gc(); + try { Util.deleteRecursive(INSTANCE.rootDir); } catch (IOException x) {