FreeChainXenon/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

69
libjava/gnu/java/net/protocol/file/Connection.java
View file

@ -42,6 +42,7 @@ import gnu.java.security.action.GetPropertyAction;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@ -49,6 +50,8 @@ import java.io.FilePermission;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.net.ProtocolException;
import java.net.URL;
import java.net.URLConnection;
@ -82,11 +85,25 @@ public class Connection extends URLConnection
private static String lineSeparator;
static
{
if (lineSeparator == null)
{
GetPropertyAction getProperty = new GetPropertyAction("line.separator");
lineSeparator = (String) AccessController.doPrivileged(getProperty);
}
}
/**
* This is a File object for this connection
*/
private File file;
/**
* If a directory, contains a list of files in the directory.
*/
private byte[] directoryListing;
/**
* InputStream if we are reading from the file
*/
@ -136,19 +153,7 @@ public class Connection extends URLConnection
{
if (doInput)
{
if (lineSeparator == null)
{
GetPropertyAction getProperty = new GetPropertyAction("line.separator");
lineSeparator = (String) AccessController.doPrivileged(getProperty);
}
StringBuffer sb = new StringBuffer();
String[] files = file.list();
for (int index = 0; index < files.length; ++index)
sb.append(files[index]).append(lineSeparator);
inputStream = new ByteArrayInputStream(sb.toString().getBytes());
inputStream = new ByteArrayInputStream(getDirectoryListing());
}
if (doOutput)
@ -158,6 +163,32 @@ public class Connection extends URLConnection
connected = true;
}
/**
* Populates the <code>directoryListing</code> field with a byte array
* containing a representation of the directory listing.
*/
byte[] getDirectoryListing()
throws IOException
{
if (directoryListing == null)
{
ByteArrayOutputStream sink = new ByteArrayOutputStream();
// NB uses default character encoding for this system
Writer writer = new OutputStreamWriter(sink);
String[] files = file.list();
for (int i = 0; i < files.length; i++)
{
writer.write(files[i]);
writer.write(lineSeparator);
}
directoryListing = sink.toByteArray();
}
return directoryListing;
}
/**
* Opens the file for reading and returns a stream for it.
@ -231,7 +262,13 @@ public class Connection extends URLConnection
if (field.equals("content-type"))
return guessContentTypeFromName(file.getName());
else if (field.equals("content-length"))
return Long.toString(file.length());
{
if (file.isDirectory())
{
return Integer.toString(getContentLength());
}
return Long.toString(file.length());
}
else if (field.equals("last-modified"))
{
synchronized (dateFormat)
@ -259,6 +296,10 @@ public class Connection extends URLConnection
if (!connected)
connect();
if (file.isDirectory())
{
return getDirectoryListing().length;
}
return (int) file.length();
}
catch (IOException e)