aboutsummaryrefslogtreecommitdiff
path: root/nailgun_launcher
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2016-03-15 23:57:23 -0400
committerChristopher Vogt <oss.nsp@cvogt.org>2016-03-20 20:35:27 -0400
commit450fc5d3defcdc279cfeef0ae622ebe4f90988e2 (patch)
treedd2666f6c553e86804df83563e9568af7902a4fd /nailgun_launcher
parenteaa4889b40bfe1fcab5f88d87b5208632d736444 (diff)
downloadcbt-450fc5d3defcdc279cfeef0ae622ebe4f90988e2.tar.gz
cbt-450fc5d3defcdc279cfeef0ae622ebe4f90988e2.tar.bz2
cbt-450fc5d3defcdc279cfeef0ae622ebe4f90988e2.zip
better toString for Java URLClassLoader. Minor enhancements
Diffstat (limited to 'nailgun_launcher')
-rw-r--r--nailgun_launcher/NailgunLauncher.java25
1 files changed, 18 insertions, 7 deletions
diff --git a/nailgun_launcher/NailgunLauncher.java b/nailgun_launcher/NailgunLauncher.java
index 1eb39a8..cd9e499 100644
--- a/nailgun_launcher/NailgunLauncher.java
+++ b/nailgun_launcher/NailgunLauncher.java
@@ -46,13 +46,13 @@ public class NailgunLauncher{
if(!classLoaderCacheKeys.containsKey(library)){
Object libraryKey = new Object();
classLoaderCacheKeys.put(library,libraryKey);
- ClassLoader libraryClassLoader = new URLClassLoader( new URL[]{ new URL("file:"+library) } );
+ ClassLoader libraryClassLoader = new CbtURLClassLoader( new URL[]{ new URL("file:"+library) } );
classLoaderCacheValues.put(libraryKey, libraryClassLoader);
String xml = CBT_HOME+"/bootstrap_scala/cache/"+SCALA_VERSION+"/scala-xml_2.11-1.0.5.jar";
Object xmlKey = new Object();
classLoaderCacheKeys.put(xml,xmlKey);
- ClassLoader xmlClassLoader = new URLClassLoader(
+ ClassLoader xmlClassLoader = new CbtURLClassLoader(
new URL[]{ new URL("file:"+xml) },
libraryClassLoader
);
@@ -60,7 +60,7 @@ public class NailgunLauncher{
Object nailgunKey = new Object();
classLoaderCacheKeys.put(NAILGUN+TARGET,nailgunKey);
- ClassLoader nailgunClassLoader = new URLClassLoader(
+ ClassLoader nailgunClassLoader = new CbtURLClassLoader(
new URL[]{ new URL("file:"+NAILGUN+TARGET) },
xmlClassLoader
);
@@ -85,10 +85,21 @@ public class NailgunLauncher{
}
}
-/*
-protected class MyURLClassLoader extends URLClassLoader{
+class CbtURLClassLoader extends URLClassLoader{
public String toString(){
- return super.toString() + "(\n " + Arrays.toString(urls) + "\n)";
+ return (
+ super.toString()
+ + "(\n "
+ + Arrays.toString(getURLs())
+ + ",\n "
+ + String.join("\n ",getParent().toString().split("\n"))
+ + "\n)"
+ );
+ }
+ public CbtURLClassLoader(URL[] urls, ClassLoader parent){
+ super(urls, parent);
+ }
+ public CbtURLClassLoader(URL[] urls){
+ super(urls);
}
}
-*/