Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

409556 FileInputStream not closed in DirectNIOBuffer

This commit is contained in:
Jan Bartel 2013-06-03 15:13:28 +10:00
parent 3094f93ed9
commit 10845bfd28
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
jetty-io/src/main/java/org/eclipse/jetty/io/nio/DirectNIOBuffer.java
View File

@ -31,6 +31,9 @@ import java.nio.channels.WritableByteChannel;
import org.eclipse.jetty.io.AbstractBuffer; import org.eclipse.jetty.io.AbstractBuffer;
import org.eclipse.jetty.io.Buffer; import org.eclipse.jetty.io.Buffer;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
/* ------------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------------- */
/** /**
@ -39,6 +42,8 @@ import org.eclipse.jetty.io.Buffer;
*/ */
public class DirectNIOBuffer extends AbstractBuffer implements NIOBuffer public class DirectNIOBuffer extends AbstractBuffer implements NIOBuffer
{ {
private static final Logger LOG = Log.getLogger(DirectNIOBuffer.class);
protected final ByteBuffer _buf; protected final ByteBuffer _buf;
private ReadableByteChannel _in; private ReadableByteChannel _in;
private InputStream _inStream; private InputStream _inStream;
@ -69,12 +74,22 @@ public class DirectNIOBuffer extends AbstractBuffer implements NIOBuffer
public DirectNIOBuffer(File file) throws IOException public DirectNIOBuffer(File file) throws IOException
{ {
super(READONLY,NON_VOLATILE); super(READONLY,NON_VOLATILE);
FileInputStream fis = new FileInputStream(file); FileInputStream fis = null;
FileChannel fc = fis.getChannel(); FileChannel fc = null;
_buf = fc.map(FileChannel.MapMode.READ_ONLY, 0, file.length()); try
setGetIndex(0); {
setPutIndex((int)file.length()); fis = new FileInputStream(file);
_access=IMMUTABLE; fc = fis.getChannel();
_buf = fc.map(FileChannel.MapMode.READ_ONLY, 0, file.length());
setGetIndex(0);
setPutIndex((int)file.length());
_access=IMMUTABLE;
}
finally
{
if (fc != null) try {fc.close();} catch (IOException e){LOG.ignore(e);}
IO.close(fis);
}
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */