luke/sbt
1
0
Fork 0
mirror of https://github.com/sbt/sbt.git synced 2026-09-03 16:39:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cache now takes in account of the parent of the classloader

Browse Source
This commit is contained in:
Eugene Yokota
2017-01-14 06:35:07 -05:00
parent 0cfde91a4b
commit dc71b171da
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/src/main/scala/sbt/internal/Load.scala
+11 -2
View File
@@ -943,13 +943,22 @@ private[sbt] object Load {
final class EvaluatedConfigurations(val eval: Eval, val settings: Seq[Setting[_]])
final case class InjectSettings(global: Seq[Setting[_]], project: Seq[Setting[_]], projectLoaded: ClassLoader => Seq[Setting[_]]) {
import java.net.URLClassLoader
private val cache: mutable.Map[Set[URL], Seq[Setting[_]]] = mutable.Map.empty
private val cache: mutable.Map[List[URL], Seq[Setting[_]]] = mutable.Map.empty
// Cache based on the underlying URL values of the classloader
def cachedProjectLoaded(cl: ClassLoader): Seq[Setting[_]] =
cl match {
case cl: URLClassLoader => cache.getOrElseUpdate(cl.getURLs.toSet, projectLoaded(cl))
case cl: URLClassLoader => cache.getOrElseUpdate(classLoaderToList(cl), projectLoaded(cl))
case _ => projectLoaded(cl)
}
private def classLoaderToList(cl: ClassLoader): List[URL] =
cl match {
case cl: URLClassLoader =>
cl.getURLs.toList ::: (Option(cl.getParent) match {
case Some(x) => classLoaderToList(x)
case _ => Nil
})
case _ => Nil
}
}
@deprecated("Use BuildUtil.apply", "0.13.0")