Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv11253
Modified Files:
Tag: MMBase-1_8
ResourceLoader.java
Log Message:
sigh
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
Index: ResourceLoader.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/ResourceLoader.java,v
retrieving revision 1.39.2.9
retrieving revision 1.39.2.10
diff -u -b -r1.39.2.9 -r1.39.2.10
--- ResourceLoader.java 21 Jul 2008 13:06:39 -0000 1.39.2.9
+++ ResourceLoader.java 21 Jul 2008 13:31:40 -0000 1.39.2.10
@@ -97,7 +97,7 @@
* <p>For property-files, the java-unicode-escaping is undone on loading, and
applied on saving, so there is no need to think of that.</p>
* @author Michiel Meeuwissen
* @since MMBase-1.8
- * @version $Id: ResourceLoader.java,v 1.39.2.9 2008/07/21 13:06:39 michiel
Exp $
+ * @version $Id: ResourceLoader.java,v 1.39.2.10 2008/07/21 13:31:40 michiel
Exp $
*/
public class ResourceLoader extends ClassLoader {
@@ -985,8 +985,10 @@
return con.getURL();
}
} else if (cf instanceof AbstractFileURLStreamHandler) {
- FileConnection con = (FileConnection) cf.openConnection(name);
- File file = con.getFile();
+ URLConnection con = cf.openConnection(name);
+ if (con instanceof FileConnection) {
+ FileConnection fc = (FileConnection) con;
+ File file = fc.getFile();
if (file.equals(f)) {
return null; // ok, not shadowed.
} else {
@@ -1000,6 +1002,7 @@
}
}
}
+ }
List files = getFiles(name);
Iterator it = files.iterator();
while (it.hasNext()) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
