procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Connection.java: Return correct content length for directory listing.

Browse source 
2005-04-27  Chris Burdess  <dog@gnu.org>

	* gnu/java/net/protocol/file/Connection.java: Return correct content
	length for directory listing.
	* java/net/URLClassLoader.java: Correction for URLClassLoader, bug
	#11285: return valid URLs for directories.i

From-SVN: r98884
This commit is contained in:
Chris Burdess 2005-04-27 21:03:00 +00:00 • committed by Michael Koch
parent 529eec21bb
commit 32cf6a3bfe
3 changed files with 88 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
libjava/java/net/URLClassLoader.java
View file

@ -610,7 +610,7 @@ public class URLClassLoader extends SecureClassLoader
Resource getResource(String name)
{
File file = new File(dir, name);
if (file.exists() && ! file.isDirectory())
if (file.exists())
return new FileResource(this, name, file);
return null;
}
@ -628,11 +628,36 @@ public class URLClassLoader extends SecureClassLoader
InputStream getInputStream() throws IOException
{
// Delegate to the URL content handler mechanism to retrieve an
// HTML representation of the directory listing if a directory
if (file.isDirectory())
{
URL url = getURL();
return url.openStream();
}
// Otherwise simply return a FileInputStream
return new FileInputStream(file);
}
public int getLength()
{
// Delegate to the URL content handler mechanism to retrieve the
// length of the HTML representation of the directory listing if
// a directory, or -1 if an exception occurs opening the directory.
if (file.isDirectory())
{
URL url = getURL();
try
{
URLConnection connection = url.openConnection();
return connection.getContentLength();
}
catch (IOException e)
{
return -1;
}
}
// Otherwise simply return the file length
return (int) file.length();
}