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

424014 - PathContentProvider does not close its internal 

SeekableByteChannel.

Fixed by closing the channel when it has been fully read and in case
of exceptions.
This commit is contained in:
Simone Bordet 2013-12-13 14:27:13 +01:00
parent ce4e07f6a4
commit 6473bbc2b6
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
jetty-client/src/main/java/org/eclipse/jetty/client/util/PathContentProvider.java
View File

@ -30,6 +30,8 @@ import java.util.Iterator;
import java.util.NoSuchElementException;
import org.eclipse.jetty.client.api.ContentProvider;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
/**
* A {@link ContentProvider} for files using JDK 7's {@code java.nio.file} APIs.
@ -39,6 +41,8 @@ import org.eclipse.jetty.client.api.ContentProvider;
*/
public class PathContentProvider implements ContentProvider
{
private static final Logger LOG = Log.getLogger(PathContentProvider.class);
private final Path filePath;
private final long fileSize;
private final int bufferSize;
@ -86,19 +90,35 @@ public class PathContentProvider implements ContentProvider
try
{
if (channel == null)
{
channel = Files.newByteChannel(filePath, StandardOpenOption.READ);
LOG.debug("Opened file {}", filePath);
}
buffer.clear();
int read = channel.read(buffer);
if (read < 0)
throw new NoSuchElementException();
if (LOG.isDebugEnabled())
LOG.debug("Read {} bytes from {}", read, filePath);
position += read;
if (!hasNext())
close();
buffer.flip();
return buffer;
}
catch (IOException x)
catch (NoSuchElementException x)
{
close();
throw x;
}
catch (Exception x)
{
close();
throw (NoSuchElementException)new NoSuchElementException().initCause(x);
}
}
@ -108,6 +128,19 @@ public class PathContentProvider implements ContentProvider
{
throw new UnsupportedOperationException();
}
private void close()
{
try
{
if (channel != null)
channel.close();
}
catch (Exception x)
{
LOG.ignore(x);
}
}
};
}
}