[freenet-cvs] r15945 - trunk/freenet/src/freenet/support

[bo...@freenetproject.org]

Author: bombe
Date: 2007-11-23 14:36:09 +0000 (Fri, 23 Nov 2007)
New Revision: 15945

Modified:
   trunk/freenet/src/freenet/support/JarClassLoader.java
Log:
better fix than r15939. allows things like getClass().getResource*("foo.bar") 
to work

Modified: trunk/freenet/src/freenet/support/JarClassLoader.java
===================================================================
--- trunk/freenet/src/freenet/support/JarClassLoader.java       2007-11-23 
13:58:58 UTC (rev 15944)
+++ trunk/freenet/src/freenet/support/JarClassLoader.java       2007-11-23 
14:36:09 UTC (rev 15945)
@@ -141,10 +141,12 @@
         * @see java.lang.ClassLoader#findResource(java.lang.String)
         */
        protected URL findResource(String name) {
-               if (!name.startsWith("/"))
-                       name = '/' + name;
+               /* compatibility code. remove when all plugins are fixed. */
+               if (name.startsWith("/")) {
+                       name = name.substring(1);
+               }
                try {
-                       return new URL("jar:" + new 
File(tempJarFile.getName()).toURI().toURL() + "!" + name);
+                       return new URL("jar:" + new 
File(tempJarFile.getName()).toURI().toURL() + "!/" + name);
                } catch (MalformedURLException e) {
                }
                return null;