diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-09 21:38:48 -0500 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-09 22:58:10 -0500 |
| commit | f42d50ab33a829322618181375cb6c5f2e71118a (patch) | |
| tree | 5013e17d4517256a9586e58f73f763996559565a /stage1/Stage1Lib.scala | |
| parent | 75092dd02fb76a6607f2aaa8f0dc04b2a88699b4 (diff) | |
| download | cbt-f42d50ab33a829322618181375cb6c5f2e71118a.tar.gz cbt-f42d50ab33a829322618181375cb6c5f2e71118a.tar.bz2 cbt-f42d50ab33a829322618181375cb6c5f2e71118a.zip | |
various smaller changes
Diffstat (limited to 'stage1/Stage1Lib.scala')
| -rw-r--r-- | stage1/Stage1Lib.scala | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/stage1/Stage1Lib.scala b/stage1/Stage1Lib.scala index ad4b2d0..f73995e 100644 --- a/stage1/Stage1Lib.scala +++ b/stage1/Stage1Lib.scala @@ -100,7 +100,7 @@ class Stage1Lib( logger: Logger ) extends BaseLib{ trapExitCode{ val c = classLoader.loadClass(cls) val m = c.getMethod( "main", classOf[Array[String]] ) - val instance = + val instance = if(!fakeInstance) null else c.newInstance assert( fakeInstance || (m.getModifiers & java.lang.reflect.Modifier.STATIC) > 0, @@ -421,8 +421,7 @@ class Stage1Lib( logger: Logger ) extends BaseLib{ val dependencies = dependency.dependencies val dependencyClassLoader: ClassLoader = { if( dependency.dependencies.isEmpty ){ - // wrap for caching - new cbt.URLClassLoader( ClassPath(), ClassLoader.getSystemClassLoader().getParent() ) + NailgunLauncher.jdkClassLoader } else if( dependencies.size == 1 ){ classLoaderRecursion( dependencies.head, latest, cache ) } else{ |