From d0a3df6c17cc94a25e1090497810e63df311a1b3 Mon Sep 17 00:00:00 2001
From: green <green@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 16 Sep 2005 22:57:10 +0000
Subject:         PR libgcj/20198         * java/net/URLClassLoader.java
 (FileURLLoader.getResource): File         resources should all have
 canonicalized names.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@104360 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/java/net/URLClassLoader.java | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'libjava/java/net/URLClassLoader.java')

diff --git a/libjava/java/net/URLClassLoader.java b/libjava/java/net/URLClassLoader.java
index 5d48c02b296..2a6f87c4093 100644
--- a/libjava/java/net/URLClassLoader.java
+++ b/libjava/java/net/URLClassLoader.java
@@ -610,9 +610,16 @@ public class URLClassLoader extends SecureClassLoader
     /** get resource with the name "name" in the file url */
     Resource getResource(String name)
     {
-      File file = new File(dir, name);
-      if (file.exists())
-        return new FileResource(this, name, file);
+      try 
+ 	{
+ 	  File file = new File(dir, name).getCanonicalFile();
+ 	  if (file.exists() && !file.isDirectory())
+ 	    return new FileResource(this, file.path(), file);
+ 	}
+      catch (IOException e)
+ 	{
+ 	  // Fall through...
+ 	}
       return null;
     }
   }
-- 
cgit v1.2.3