concordion · nigelcharman · Feb 7, 2018 · Feb 7, 2018
diff --git a/src/main/java/org/concordion/internal/FixtureSpecificationMapper.java b/src/main/java/org/concordion/internal/FixtureSpecificationMapper.java
@@ -18,7 +18,12 @@
  */
 public class FixtureSpecificationMapper {
 
-    private static ServiceLoader<TestFrameworkProvider> serviceLoader = ServiceLoader.load(TestFrameworkProvider.class);
+    private static ThreadLocal serviceLoaderHolder  = new ThreadLocal<ServiceLoader<TestFrameworkProvider>>() {
+        @Override
+        protected ServiceLoader<TestFrameworkProvider> initialValue() {
+            return ServiceLoader.load(TestFrameworkProvider.class);
+        }
+    };
 
     public static Resource toSpecificationResource(Object fixture, String specificationSuffix) {
         String slashedClassName = fixture.getClass().getName().replaceAll("\\.", "/");
@@ -49,6 +54,7 @@ public static Class<?> findFixtureClass(Resource hrefResource) throws ClassNotFo
     private static Class<?> getFixtureClass(String name) throws ClassNotFoundException {
         try {
             Class<?> clazz = Class.forName(name);
+            ServiceLoader<TestFrameworkProvider> serviceLoader = (ServiceLoader<TestFrameworkProvider>) serviceLoaderHolder.get();
             Iterator<TestFrameworkProvider> iterator = serviceLoader.iterator();
             while (iterator.hasNext()) {
                 TestFrameworkProvider provider = iterator.next();