diff options
| author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2017-04-02 01:50:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-02 01:50:00 -0400 |
| commit | e7112d59b811ca4a0bda448a18e0c45cb4841abb (patch) | |
| tree | 2abdb4cc62be231240404ccb8d41d27be03cd458 /stage1 | |
| parent | 05d9dd8128b21eb64ffe6206af624237ac504b89 (diff) | |
| parent | 99d3123cdbff73cb9a9dd49bc334b47a5a8b6021 (diff) | |
| download | cbt-e7112d59b811ca4a0bda448a18e0c45cb4841abb.tar.gz cbt-e7112d59b811ca4a0bda448a18e0c45cb4841abb.tar.bz2 cbt-e7112d59b811ca4a0bda448a18e0c45cb4841abb.zip | |
Merge pull request #474 from cvogt/chris2
saner -debug behavior
Diffstat (limited to 'stage1')
| -rw-r--r-- | stage1/Stage1Lib.scala | 4 |
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 = { |