1 files changed, 13 insertions, 28 deletions

diff --git a/src/main/java/org/junit/internal/requests/ClassRequest.java b/src/main/java/org/junit/internal/requests/ClassRequest.java
index d60e360..3d6b100 100644
--- a/src/main/java/org/junit/internal/requests/ClassRequest.java
+++ b/src/main/java/org/junit/internal/requests/ClassRequest.java
@@ -1,18 +1,20 @@
 package org.junit.internal.requests;
 
 import org.junit.internal.builders.AllDefaultPossibilitiesBuilder;
-import org.junit.internal.builders.SuiteMethodBuilder;
+import org.junit.runner.Request;
 import org.junit.runner.Runner;
-import org.junit.runners.model.RunnerBuilder;
 
-public class ClassRequest extends MemoizingRequest {
+public class ClassRequest extends Request {
+    private final Object runnerLock = new Object();
+
     /*
      * We have to use the f prefix, because IntelliJ's JUnit4IdeaTestRunner uses
      * reflection to access this field. See
-     * https://github.com/junit-team/junit4/issues/960
+     * https://github.com/junit-team/junit/issues/960
      */
     private final Class<?> fTestClass;
     private final boolean canUseSuiteMethod;
+    private volatile Runner runner;
 
     public ClassRequest(Class<?> testClass, boolean canUseSuiteMethod) {
         this.fTestClass = testClass;
@@ -24,31 +26,14 @@ public class ClassRequest extends MemoizingRequest {
     }
 
     @Override
-    protected Runner createRunner() {
-        return new CustomAllDefaultPossibilitiesBuilder().safeRunnerForClass(fTestClass);
-    }
-
-    private class CustomAllDefaultPossibilitiesBuilder extends AllDefaultPossibilitiesBuilder {
-
-        @Override
-        protected RunnerBuilder suiteMethodBuilder() {
-            return new CustomSuiteMethodBuilder();
-        }
-    }
-
-    /*
-     * Customization of {@link SuiteMethodBuilder} that prevents use of the
-     * suite method when creating a runner for fTestClass when canUseSuiteMethod
-     * is false.
-     */
-    private class CustomSuiteMethodBuilder extends SuiteMethodBuilder {
-
-        @Override
-        public Runner runnerForClass(Class<?> testClass) throws Throwable {
-            if (testClass == fTestClass && !canUseSuiteMethod) {
-                return null;
+    public Runner getRunner() {
+        if (runner == null) {
+            synchronized (runnerLock) {
+                if (runner == null) {
+                    runner = new AllDefaultPossibilitiesBuilder(canUseSuiteMethod).safeRunnerForClass(fTestClass);
+                }
             }
-            return super.runnerForClass(testClass);
         }
+        return runner;
     }
 }
\ No newline at end of file