diff options
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{ |