zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Console: Java 9 fixes for classloader (ticket #1870)

Browse Source 
May not be sufficient for plugins
Unlinkify viewmtn links on /jars, site is down
This commit is contained in:
zzz
2016-10-29 16:21:02 +00:00
parent 484a3903ca
commit 6ff9483e07
5 changed files with 66 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java
View File

@@ -110,7 +110,7 @@ public class WebAppConfiguration implements Configuration {
return;
StringTokenizer tok = new StringTokenizer(cp, " ,");
StringBuilder buf = new StringBuilder();
Set<URI> systemCP = getSystemClassPath();
Set<URI> systemCP = getSystemClassPath(i2pContext);
while (tok.hasMoreTokens()) {
if (buf.length() > 0)
buf.append(',');
@@ -159,14 +159,28 @@ public class WebAppConfiguration implements Configuration {
* but keep findbugs happy.
* @since 0.9
*/
private static Set<URI> getSystemClassPath() {
URLClassLoader urlClassLoader = (URLClassLoader) ClassLoader.getSystemClassLoader();
URL urls[] = urlClassLoader.getURLs();
private static Set<URI> getSystemClassPath(I2PAppContext ctx) {
Set<URI> rv = new HashSet<URI>(32);
for (int i = 0; i < urls.length; i++) {
try {
rv.add(urls[i].toURI());
} catch (URISyntaxException use) {}
ClassLoader loader = ClassLoader.getSystemClassLoader();
if (loader instanceof URLClassLoader) {
// through Java 8, not available in Java 9
URLClassLoader urlClassLoader = (URLClassLoader) loader;
URL urls[] = urlClassLoader.getURLs();
for (int i = 0; i < urls.length; i++) {
try {
rv.add(urls[i].toURI());
} catch (URISyntaxException use) {}
}
} else {
// Java 9 - assume everything in lib/ is in the classpath
File libDir = new File(ctx.getBaseDir(), "lib");
File[] files = libDir.listFiles();
if (files != null) {
for (int i = 0; i < files.length; i++) {
if (files[i].getName().endsWith(".jar"))
rv.add(files[i].toURI());
}
}
}
return rv;
}