From 04198061bc2d32577b1b8c037b21385e2d0165c2 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Mon, 8 Feb 2010 18:34:10 -0500 Subject: [PATCH] Fix ClassLoader for launcher, which fixes web/jsp in sbt --- launch/FilteredLoader.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/launch/FilteredLoader.scala b/launch/FilteredLoader.scala index bfad526d4..7f7838196 100644 --- a/launch/FilteredLoader.scala +++ b/launch/FilteredLoader.scala @@ -18,7 +18,7 @@ private[boot] final class BootFilteredLoader(parent: ClassLoader) extends ClassL else super.loadClass(className, resolve) } - override def getResources(name: String) = if(includeResource(name)) super.getResources(name) else null - override def getResource(name: String) = if(includeResource(name)) super.getResource(name) else null + override def getResources(name: String) = if(includeResource(name)) super.getResources(name) else parent.getParent.getResources(name) + override def getResource(name: String) = if(includeResource(name)) super.getResource(name) else parent.getParent.getResource(name) def includeResource(name: String) = name.startsWith(JLinePackagePath) } \ No newline at end of file