re PR classpath/20198 (java.security.CodeSource.getLocation output is different than expected)
PR libgcj/20198 * java/net/URLClassLoader.java (FileURLLoader.getResource): File resources should all have canonicalized names. From-SVN: r104360
This commit is contained in:
parent
10d6edf84c
commit
ba80a8b264
2 changed files with 16 additions and 3 deletions
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue