diff --git a/server/src/main/java/com/mirth/connect/server/userutil/ContextFactory.java b/server/src/main/java/com/mirth/connect/server/userutil/ContextFactory.java index c3aa5c0567..a633f9e893 100644 --- a/server/src/main/java/com/mirth/connect/server/userutil/ContextFactory.java +++ b/server/src/main/java/com/mirth/connect/server/userutil/ContextFactory.java @@ -52,11 +52,12 @@ public ClassLoader getClassLoader() { /** * Returns a classloader containing only the libraries contained in the custom resources, with - * no parent classloader. If no custom libraries are being used in the current JavaScript - * context, this will return null. + * {@code System.getPlatformClassLoader()} as parent classloader. If no custom libraries are being used + * in the current JavaScript context, this will return null. This classloader always loads classes + * parent-first, and the "Load Parent-First" option on Resources has no effect on it. * * @return A classloader containing only the libraries contained in the custom resources, with - * no parent classloader. + * {@code System.getPlatformClassLoader()} as parent classloader. */ public ClassLoader getIsolatedClassLoader() { return delegate.getIsolatedClassLoader(); diff --git a/server/src/main/java/com/mirth/connect/server/util/javascript/MirthContextFactory.java b/server/src/main/java/com/mirth/connect/server/util/javascript/MirthContextFactory.java index 5e303757d5..6ba3bb35f1 100644 --- a/server/src/main/java/com/mirth/connect/server/util/javascript/MirthContextFactory.java +++ b/server/src/main/java/com/mirth/connect/server/util/javascript/MirthContextFactory.java @@ -114,7 +114,7 @@ public ClassLoader getIsolatedClassLoader() { if (isolatedClassLoader == null && ArrayUtils.isNotEmpty(urls)) { synchronized (this) { if (isolatedClassLoader == null) { - isolatedClassLoader = new URLClassLoader(urls, null); + isolatedClassLoader = new URLClassLoader(urls, ClassLoader.getPlatformClassLoader()); } } }