aboutsummaryrefslogtreecommitdiff
path: root/stage1
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2017-04-01 13:40:29 -0400
committerChristopher Vogt <oss.nsp@cvogt.org>2017-04-01 13:40:29 -0400
commit7e96f539872dc28d040b24b9aa81f7cf08f8cbf3 (patch)
treea8ff785c0d1c63398d2bf40fb1ef50e70b7c611f /stage1
parent05d9dd8128b21eb64ffe6206af624237ac504b89 (diff)
downloadcbt-7e96f539872dc28d040b24b9aa81f7cf08f8cbf3.tar.gz
cbt-7e96f539872dc28d040b24b9aa81f7cf08f8cbf3.tar.bz2
cbt-7e96f539872dc28d040b24b9aa81f7cf08f8cbf3.zip
hopefully more self-explanatory name
Diffstat (limited to 'stage1')
-rw-r--r--stage1/Stage1Lib.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/stage1/Stage1Lib.scala b/stage1/Stage1Lib.scala
index 392b885..6e2963e 100644
--- a/stage1/Stage1Lib.scala
+++ b/stage1/Stage1Lib.scala
@@ -80,7 +80,7 @@ class Stage1Lib( logger: Logger ) extends
}
def getCbtMain( cls: Class[_] ): cbt.reflect.StaticMethod[Context, ExitCode] =
- findStaticMethodForced[Context, ExitCode]( cls, "cbtMain" )
+ findStaticMethodOrFail[Context, ExitCode]( cls, "cbtMain" )
def findCbtMain( cls: Class[_] ): Option[cbt.reflect.StaticMethod[Context, ExitCode]] =
findStaticMethod[Context, ExitCode]( cls, "cbtMain" )
@@ -376,7 +376,7 @@ ${sourceFiles.sorted.mkString(" \\\n")}
case d => d
}
- def classLoaderRecursion( dependency: Dependency, latest: Map[(String,String),Dependency])(implicit transientCache: java.util.Map[AnyRef,AnyRef], cache: ClassLoaderCache): ClassLoader = {
+ def classLoaderRecursion( dependency: Dependency, latest: Map[(String,String),Dependency] )(implicit transientCache: java.util.Map[AnyRef,AnyRef], cache: ClassLoaderCache): ClassLoader = {
// FIXME: shouldn't we be using KeyLockedLazyCache instead of hashmap directly here?
val dependencies = dependency.dependencies.toVector
val dependencyClassLoader: ClassLoader = {