summaryrefslogtreecommitdiff
path: root/main/core
diff options
context:
space:
mode:
authoraosagie <osagie@gmail.com>2018-09-02 02:21:35 -0400
committerLi Haoyi <haoyi.sg@gmail.com>2018-09-02 14:21:35 +0800
commita6efead6bafd34a7c55a58e3dc5d6267345672f1 (patch)
treeb8b2c9fbc62a2e6378a258f32544ae5aba36962f /main/core
parented95f2dd558a82f6b84f7f0dc3d80b3038683950 (diff)
downloadmill-a6efead6bafd34a7c55a58e3dc5d6267345672f1.tar.gz
mill-a6efead6bafd34a7c55a58e3dc5d6267345672f1.tar.bz2
mill-a6efead6bafd34a7c55a58e3dc5d6267345672f1.zip
Fix shutdown hook failures in tests (#422)
* Remove duplication from ClassLoader.create * Prevent closing of context class loader in tests so that shutdown hooks can run
Diffstat (limited to 'main/core')
-rw-r--r--main/core/src/mill/util/ClassLoader.scala12
1 files changed, 1 insertions, 11 deletions
diff --git a/main/core/src/mill/util/ClassLoader.scala b/main/core/src/mill/util/ClassLoader.scala
index c0421a7b..17268fb0 100644
--- a/main/core/src/mill/util/ClassLoader.scala
+++ b/main/core/src/mill/util/ClassLoader.scala
@@ -8,17 +8,7 @@ import io.github.retronym.java9rtexport.Export
object ClassLoader {
def create(urls: Seq[URL], parent: java.lang.ClassLoader)(
- implicit ctx: Ctx.Home): URLClassLoader = {
- new URLClassLoader(
- makeUrls(urls).toArray,
- refinePlatformParent(parent)
- ) {
- override def findClass(name: String): Class[_] = {
- if (name.startsWith("com.sun.jna")) getClass.getClassLoader.loadClass(name)
- else super.findClass(name)
- }
- }
- }
+ implicit ctx: Ctx.Home): URLClassLoader = create(urls, parent, _ => None)
def create(urls: Seq[URL],
parent: java.lang.ClassLoader,