Changeset 0cea3e0

Timestamp:

Mar 6, 2012 2:04:04 PM (9 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

175e464c

Parents:

de2b204

Message:

• Webapp class loader: Fix dup classes in classpath caused by last checkin (symptom: i2psnark in wrong directory)

Files:

• apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java (modified) (4 diffs)
• history.txt (modified) (1 diff)
• router/java/src/net/i2p/router/RouterVersion.java (modified) (1 diff)

apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java

@@ -2 +2 @@
 
 import java.io.File;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.HashSet;
 import java.util.Properties;
+import java.util.Set;
 import java.util.StringTokenizer;
 
@@ -84 +88 @@
         StringTokenizer tok = new StringTokenizer(cp, " ,");
         StringBuilder buf = new StringBuilder();
+        Set<URL> systemCP = getSystemClassPath();
         while (tok.hasMoreTokens()) {
             if (buf.length() > 0)
@@ -95 +100 @@
             else
                 path = dir.getAbsolutePath() + '/' + elem;
+            // As of Jetty 6, we can't add dups to the class path, or
+            // else it screws up statics
+            File jfile = new File(path);
+            File jdir = jfile.getParentFile();
+            if (systemCP.contains(jfile.toURI().toURL()) ||
+                (jdir != null && systemCP.contains(jdir.toURI().toURL()))) {
+                //System.err.println("Not adding " + path + " to classpath for " + appName + ", already in system classpath");
+                continue;
+            }
             System.err.println("Adding " + path + " to classpath for " + appName);
             buf.append(path);
         }
+        if (buf.length() <= 0)
+            return;
         ClassLoader cl = _wac.getClassLoader();
         if (cl != null && cl instanceof WebAppClassLoader) {
@@ -108 +124 @@
             _wac.setExtraClasspath(buf.toString());
         }
+    }
+
+    /** @since 0.9 */
+    private static Set<URL> getSystemClassPath() {
+        URLClassLoader urlClassLoader = (URLClassLoader) ClassLoader.getSystemClassLoader();
+        URL urls[] = urlClassLoader.getURLs();
+        Set<URL> rv = new HashSet(32);
+        for (int i = 0; i < urls.length; i++) {
+            rv.add(urls[i]);
+        }
+        return rv;
     }
 

history.txt

@@ +1 @@
+2012-03-06 zzz
+  * i2psnark: Fix NPE on magnet link addition
+  * Jetty logger: Fix stack trace logging
+  * viewstat.jsp: Properly close the ImageOutputStream to fix
+    NPEs in the finalizer, probably was the root cause of
+    what we blamed on Jetty
+  * Webapp class loader: Fix dup classes in classpath
+    caused by last checkin (symptom: i2psnark in wrong directory)
+
 2012-03-05 zzz
   * Build: Make windows and non-windows installers for release

router/java/src/net/i2p/router/RouterVersion.java

@@ -19 +19 @@
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 5;
+    public final static long BUILD = 6;
 
     /** for example "-test" */