1 files changed, 13 insertions, 1 deletions
diff --git a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt
index 9c9a866d..ccc7f03a 100644
--- a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt
+++ b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt
@@ -45,6 +45,7 @@ import java.io.File
 import java.time.Duration
 import java.util.*
 import java.util.concurrent.*
+import java.util.concurrent.ForkJoinPool.ForkJoinWorkerThreadFactory
 
 /**
  * Class to execute the pending jobs via the OpenDC web API.
@@ -81,7 +82,7 @@ public class OpenDCRunner(
     /**
      * The [ForkJoinPool] that is used to execute the simulation jobs.
      */
-    private val pool = ForkJoinPool(parallelism)
+    private val pool = ForkJoinPool(parallelism, RunnerThreadFactory(Thread.currentThread().contextClassLoader), null, false)
 
     /**
      * A [ScheduledExecutorService] to manage the heartbeat of simulation jobs as well as tracking the deadline of
@@ -303,4 +304,15 @@ public class OpenDCRunner(
             override fun toString(): String = "WebRunnerTopologyFactory"
         }
     }
+
+    /**
+     * A custom [ForkJoinWorkerThreadFactory] that uses the [ClassLoader] of specified by the runner.
+     */
+    private class RunnerThreadFactory(private val classLoader: ClassLoader) : ForkJoinWorkerThreadFactory {
+        override fun newThread(pool: ForkJoinPool): ForkJoinWorkerThread = object : ForkJoinWorkerThread(pool) {
+            init {
+                contextClassLoader = classLoader
+            }
+        }
+    }
 }