diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-11-10 01:43:04 -0500 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-11-10 01:44:46 -0500 |
commit | fcd003b384ccbe49c7f1f2d3a19e7627149e7e07 (patch) | |
tree | a64774dfd729677ec23eab4807d022e9ff154d1a /nailgun_launcher/NailgunLauncher.java | |
parent | e6568ab2b821891acfeb5ded1e0555ebc5f9fe81 (diff) | |
download | cbt-fcd003b384ccbe49c7f1f2d3a19e7627149e7e07.tar.gz cbt-fcd003b384ccbe49c7f1f2d3a19e7627149e7e07.tar.bz2 cbt-fcd003b384ccbe49c7f1f2d3a19e7627149e7e07.zip |
more sanity checks for cbt's classloaders
Diffstat (limited to 'nailgun_launcher/NailgunLauncher.java')
-rw-r--r-- | nailgun_launcher/NailgunLauncher.java | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/nailgun_launcher/NailgunLauncher.java b/nailgun_launcher/NailgunLauncher.java index 6639218..dede00b 100644 --- a/nailgun_launcher/NailgunLauncher.java +++ b/nailgun_launcher/NailgunLauncher.java @@ -44,8 +44,8 @@ public class NailgunLauncher{ res .classLoader .loadClass("cbt.Stage1") - .getMethod( "getBuild", Object.class, Boolean.class ) - .invoke(null, context, res.changed); + .getMethod( "getBuild", Object.class, BuildStage1Result.class ) + .invoke(null, context, res); } public static void main( String[] args ) throws Throwable { @@ -92,13 +92,13 @@ public class NailgunLauncher{ .loadClass("cbt.Stage1") .getMethod( "run", - String[].class, File.class, File.class, Boolean.class, - File.class, Long.class, ConcurrentHashMap.class, ConcurrentHashMap.class + String[].class, File.class, File.class, BuildStage1Result.class, + Long.class, ConcurrentHashMap.class, ConcurrentHashMap.class ) .invoke( null, - (Object) args, new File(cache), new File(CBT_HOME), res.changed, - new File(compatibilityTarget), start, classLoaderCache.keys, classLoaderCache.values + (Object) args, new File(cache), new File(CBT_HOME), res, + start, classLoaderCache.keys, classLoaderCache.values ) ); } catch (java.lang.reflect.InvocationTargetException e) { @@ -186,15 +186,10 @@ public class NailgunLauncher{ return new BuildStage1Result( changed, - stage1classLoader + stage1classLoader, + stage1Classpath, + nailgunClasspath, + compatibilityTarget ); } } -class BuildStage1Result{ - Boolean changed; - ClassLoader classLoader; - BuildStage1Result( Boolean changed, ClassLoader classLoader ){ - this.changed = changed; - this.classLoader = classLoader; - } -} |