Make MockMakerRegistry initialization lazy (#1826)

spockframework · Nov 12, 2023 · 1329afc · 1329afc
1 parent 2c0731d
commit 1329afc
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/spock-core/src/main/java/org/spockframework/runtime/RunContext.java b/spock-core/src/main/java/org/spockframework/runtime/RunContext.java
@@ -78,15 +78,9 @@ private void start() {
       ConfigurationBuilder builder = new ConfigurationBuilder();
       builder.build(globalExtensionRegistry, configurationScript);
     }
-    initMockMakerRegistry();
     globalExtensionRegistry.startGlobalExtensions();
   }
 
-  private void initMockMakerRegistry() {
-    MockMakerConfiguration configuration = globalExtensionRegistry.getConfigurationByType(MockMakerConfiguration.class);
-    this.mockMakerRegistry = MockMakerRegistry.createFromServiceLoader(configuration);
-  }
-
   void stop() {
     globalExtensionRegistry.stopGlobalExtensions();
   }
@@ -105,9 +99,21 @@ public ExtensionRunner createExtensionRunner(SpecInfo spec) {
   }
 
   public MockMakerRegistry getMockMakerRegistry() {
+    initMockMakerRegistry();
     return Objects.requireNonNull(mockMakerRegistry);
   }
 
+  private void initMockMakerRegistry() {
+    if (mockMakerRegistry == null) {
+      synchronized (this) {
+        if (mockMakerRegistry == null) {
+          MockMakerConfiguration configuration = globalExtensionRegistry.getConfigurationByType(MockMakerConfiguration.class);
+          mockMakerRegistry = MockMakerRegistry.createFromServiceLoader(configuration);
+        }
+      }
+    }
+  }
+
   public PlatformParameterizedSpecRunner createSpecRunner(SpecInfo spec) {
     return new PlatformParameterizedSpecRunner(
       new MasterRunSupervisor(spec, createStackTraceFilter(spec), diffedObjectRenderer));