Estimate ideal class loader caching: reuse the class loader of all cl…

…asses
luontola · Feb 10, 2013 · b9e3015 · b9e3015
1 parent 3051283
commit b9e3015
Showing 1 changed file with 3 additions and 29 deletions.
diff --git a/jumi-core/src/main/java/fi/jumi/core/suite/SuiteFactory.java b/jumi-core/src/main/java/fi/jumi/core/suite/SuiteFactory.java
@@ -17,7 +17,7 @@
 import fi.jumi.core.util.*;
 
 import javax.annotation.concurrent.NotThreadSafe;
-import java.io.*;
+import java.io.PrintStream;
 import java.net.*;
 import java.nio.file.*;
 import java.util.*;
@@ -49,29 +49,10 @@ public SuiteFactory(DaemonConfiguration daemonConfiguration, OutputCapturer outp
     }
 
     public void configure(SuiteConfiguration suite) {
-        List<URI> dependencies = new ArrayList<>();
-        List<URI> application = new ArrayList<>();
-        for (URI uri : suite.getClassPath()) {
-            String path = uri.getPath();
-            if (path.contains("dimdwarf") ||
-                    path.contains("jdave") ||
-                    path.contains("mockito") ||
-                    path.contains("jmock")) {
-                application.add(uri);
-            } else {
-                dependencies.add(uri);
-            }
-        }
-
         if (cachedClassLoader == null) {
-            cachedClassLoader = createClassLoader(dependencies);
-        }
-        try {
-            testClassLoader = new URLClassLoader(asUrls(application), cachedClassLoader);
-        } catch (MalformedURLException e) {
-            throw new RuntimeException(e);
+            cachedClassLoader = createClassLoader(suite.getClassPath());
         }
-
+        testClassLoader = cachedClassLoader;
         testFileFinder = createTestFileFinder(suite);
         driverFinder = DriverFinderFactory.createDriverFinder(testClassLoader, logOutput);
         runIdSequence = new RunIdSequence();
@@ -133,13 +114,6 @@ public void close() {
         if (testThreadPool != null) {
             testThreadPool.shutdownNow();
         }
-        if (testClassLoader != null) {
-            try {
-                testClassLoader.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
     }
 
     private static URLClassLoader createClassLoader(List<URI> classpath) {