Changeset 0cea3e0
- Timestamp:
- Mar 6, 2012 2:04:04 PM (9 years ago)
- Branches:
- master
- Children:
- 175e464c
- Parents:
- de2b204
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java
rde2b204 r0cea3e0 2 2 3 3 import java.io.File; 4 import java.net.URL; 5 import java.net.URLClassLoader; 6 import java.util.HashSet; 4 7 import java.util.Properties; 8 import java.util.Set; 5 9 import java.util.StringTokenizer; 6 10 … … 84 88 StringTokenizer tok = new StringTokenizer(cp, " ,"); 85 89 StringBuilder buf = new StringBuilder(); 90 Set<URL> systemCP = getSystemClassPath(); 86 91 while (tok.hasMoreTokens()) { 87 92 if (buf.length() > 0) … … 95 100 else 96 101 path = dir.getAbsolutePath() + '/' + elem; 102 // As of Jetty 6, we can't add dups to the class path, or 103 // else it screws up statics 104 File jfile = new File(path); 105 File jdir = jfile.getParentFile(); 106 if (systemCP.contains(jfile.toURI().toURL()) || 107 (jdir != null && systemCP.contains(jdir.toURI().toURL()))) { 108 //System.err.println("Not adding " + path + " to classpath for " + appName + ", already in system classpath"); 109 continue; 110 } 97 111 System.err.println("Adding " + path + " to classpath for " + appName); 98 112 buf.append(path); 99 113 } 114 if (buf.length() <= 0) 115 return; 100 116 ClassLoader cl = _wac.getClassLoader(); 101 117 if (cl != null && cl instanceof WebAppClassLoader) { … … 108 124 _wac.setExtraClasspath(buf.toString()); 109 125 } 126 } 127 128 /** @since 0.9 */ 129 private static Set<URL> getSystemClassPath() { 130 URLClassLoader urlClassLoader = (URLClassLoader) ClassLoader.getSystemClassLoader(); 131 URL urls[] = urlClassLoader.getURLs(); 132 Set<URL> rv = new HashSet(32); 133 for (int i = 0; i < urls.length; i++) { 134 rv.add(urls[i]); 135 } 136 return rv; 110 137 } 111 138 -
history.txt
rde2b204 r0cea3e0 1 2012-03-06 zzz 2 * i2psnark: Fix NPE on magnet link addition 3 * Jetty logger: Fix stack trace logging 4 * viewstat.jsp: Properly close the ImageOutputStream to fix 5 NPEs in the finalizer, probably was the root cause of 6 what we blamed on Jetty 7 * Webapp class loader: Fix dup classes in classpath 8 caused by last checkin (symptom: i2psnark in wrong directory) 9 1 10 2012-03-05 zzz 2 11 * Build: Make windows and non-windows installers for release -
router/java/src/net/i2p/router/RouterVersion.java
rde2b204 r0cea3e0 19 19 public final static String ID = "Monotone"; 20 20 public final static String VERSION = CoreVersion.VERSION; 21 public final static long BUILD = 5;21 public final static long BUILD = 6; 22 22 23 23 /** for example "-test" */
Note: See TracChangeset
for help on using the changeset viewer.