summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Jolly <olivier.jolly@pcedev.com>2006-03-05 17:20:51 +0000
committerOlivier Jolly <olivier.jolly@pcedev.com>2006-03-05 17:20:51 +0000
commitb69fa52dce34b8400f06843fc311dbb86fd25730 (patch)
tree1016c3ce6242c92324439cdf5a1095b6d57b676b
parente2a91479d2a303040b659b1d50266779e579083e (diff)
downloadclasspath-b69fa52dce34b8400f06843fc311dbb86fd25730.tar.gz
2006-03-05 Olivier Jolly <olivier.jolly@pcedev.com>
Fixes PR 22813 * java/net/URLClassLoader.java (FileURLLoader.getResource): Allows directories as valid resources.
-rw-r--r--ChangeLog6
-rw-r--r--java/net/URLClassLoader.java2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2331912a7..68558f709 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-05 Olivier Jolly <olivier.jolly@pcedev.com>
+
+ Fixes PR 22813
+ * java/net/URLClassLoader.java (FileURLLoader.getResource):
+ Allows directories as valid resources.
+
2006-03-04 Mark Wielaard <mark@klomp.org>
* configure.ac (VERSION): Set to 0.90-pre.
diff --git a/java/net/URLClassLoader.java b/java/net/URLClassLoader.java
index 9e489db53..ffa73dda6 100644
--- a/java/net/URLClassLoader.java
+++ b/java/net/URLClassLoader.java
@@ -539,7 +539,7 @@ public class URLClassLoader extends SecureClassLoader
try
{
File file = new File(dir, name).getCanonicalFile();
- if (file.exists() && !file.isDirectory())
+ if (file.exists())
return new FileResource(this, file);
}
catch (IOException e)