luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cache now takes in account of the parent of the classloader

This commit is contained in:
Eugene Yokota 2016-05-25 12:21:35 -04:00
parent 81bff4b67b
commit 4900c71ff9
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main/src/main/scala/sbt/Load.scala
View File

@ -974,13 +974,22 @@ 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("LoadedDefinitions is now top-level", "0.13.0")