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

handle directory classpath entries in ClasspathFilter. Fixes #783.

This commit is contained in:
Mark Harrah 2013-06-15 23:55:05 -04:00
parent fb27f5558c
commit 8372d0a751
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
util/classpath/src/main/scala/sbt/classpath/ClassLoaders.scala
View File

@ -47,6 +47,7 @@ final class SelfFirstLoader(classpath: Seq[URL], parent: ClassLoader) extends Lo
/** Doesn't load any classes itself, but instead verifies that all classes loaded through `parent` either come from `root` or `classpath`.*/ /** Doesn't load any classes itself, but instead verifies that all classes loaded through `parent` either come from `root` or `classpath`.*/
final class ClasspathFilter(parent: ClassLoader, root: ClassLoader, classpath: Set[File]) extends ClassLoader(parent) final class ClasspathFilter(parent: ClassLoader, root: ClassLoader, classpath: Set[File]) extends ClassLoader(parent)
{ {
private[this] val directories: Seq[File] = classpath.toSeq.filter(_.isDirectory)
override def loadClass(className: String, resolve: Boolean): Class[_] = override def loadClass(className: String, resolve: Boolean): Class[_] =
{ {
val c = super.loadClass(className, resolve) val c = super.loadClass(className, resolve)
@ -64,7 +65,7 @@ final class ClasspathFilter(parent: ClassLoader, root: ClassLoader, classpath: S
private[this] def onClasspath(src: URL): Boolean = private[this] def onClasspath(src: URL): Boolean =
(src eq null) || ( (src eq null) || (
IO.urlAsFile(src) match { IO.urlAsFile(src) match {
case Some(f) => classpath(f) case Some(f) => classpath(f) || directories.exists(dir => IO.relativize(dir, f).isDefined)
case None => false case None => false
} }
) )