aboutsummaryrefslogtreecommitdiff
path: root/libraries/eval
diff options
context:
space:
mode:
authorKyle Maxwell <kmaxwell@twitter.com>2011-02-23 10:18:11 -0800
committerChristopher Vogt <oss.nsp@cvogt.org>2016-11-07 02:08:37 -0500
commit705f9e24481693297e98db79adbb9aa8cd1c5a96 (patch)
tree55450c06433ad9b1bac31e2d0dca30225c72d44b /libraries/eval
parente0883058a6149e3e968dfe024600108aee64e1b4 (diff)
downloadcbt-705f9e24481693297e98db79adbb9aa8cd1c5a96.tar.gz
cbt-705f9e24481693297e98db79adbb9aa8cd1c5a96.tar.bz2
cbt-705f9e24481693297e98db79adbb9aa8cd1c5a96.zip
fix the classpath not found bug
Diffstat (limited to 'libraries/eval')
-rw-r--r--libraries/eval/Eval.scala8
1 files changed, 5 insertions, 3 deletions
diff --git a/libraries/eval/Eval.scala b/libraries/eval/Eval.scala
index f145fed..4bd7ac2 100644
--- a/libraries/eval/Eval.scala
+++ b/libraries/eval/Eval.scala
@@ -85,12 +85,14 @@ object Eval {
/*
* For a given FQ classname, trick the resource finder into telling us the containing jar.
*/
- private def jarPathOfClass(className: String) = {
+ private def jarPathOfClass(className: String) = try {
val resource = className.split('.').mkString("/", "/", ".class")
val path = getClass.getResource(resource).getPath
val indexOfFile = path.indexOf("file:") + 5
val indexOfSeparator = path.lastIndexOf('!')
- path.substring(indexOfFile, indexOfSeparator)
+ List(path.substring(indexOfFile, indexOfSeparator))
+ } catch {
+ case e: NullPointerException => List.empty[String] // Couldn't find the resource.
}
/*
@@ -130,7 +132,7 @@ object Eval {
settings.unchecked.value = true // enable detailed unchecked warnings
settings.outputDirs.setSingleOutput(virtualDirectory)
- val pathList = List(compilerPath, libPath)
+ val pathList = compilerPath ::: libPath
settings.bootclasspath.value = pathList.mkString(File.pathSeparator)
settings.classpath.value = (pathList ::: impliedClassPath).mkString(File.pathSeparator)