summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-01-11 23:49:17 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-01-11 23:49:17 -0800
commitdea3b0d87facc657d42072ecffa791eaedc39017 (patch)
tree26451f2924cc7646055d07caf123e7f2e509c41f
parentcf1bd5afba6d7c3fb3337e50f256f07c56e88571 (diff)
downloadmill-dea3b0d87facc657d42072ecffa791eaedc39017.tar.gz
mill-dea3b0d87facc657d42072ecffa791eaedc39017.tar.bz2
mill-dea3b0d87facc657d42072ecffa791eaedc39017.zip
Properly close file inputstreams after hashing files, and eagerly close classloaders used for running tests
-rw-r--r--core/src/main/scala/mill/eval/PathRef.scala2
-rw-r--r--scalalib/src/main/scala/mill/scalalib/TestRunner.scala1
2 files changed, 3 insertions, 0 deletions
diff --git a/core/src/main/scala/mill/eval/PathRef.scala b/core/src/main/scala/mill/eval/PathRef.scala
index 784d9ad4..0a629a14 100644
--- a/core/src/main/scala/mill/eval/PathRef.scala
+++ b/core/src/main/scala/mill/eval/PathRef.scala
@@ -47,6 +47,8 @@ case class PathRef(path: ammonite.ops.Path, quick: Boolean = false){
}
}
rec()
+
+ is.close()
}
FileVisitResult.CONTINUE
}
diff --git a/scalalib/src/main/scala/mill/scalalib/TestRunner.scala b/scalalib/src/main/scala/mill/scalalib/TestRunner.scala
index e1985848..0d1768f6 100644
--- a/scalalib/src/main/scala/mill/scalalib/TestRunner.scala
+++ b/scalalib/src/main/scala/mill/scalalib/TestRunner.scala
@@ -146,6 +146,7 @@ object TestRunner {
(doneMsg, results)
}finally{
Thread.currentThread().setContextClassLoader(oldCl)
+ cl.close()
}