Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-6124: fix double-close() bugs in WindowsFS etc 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1646889 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2014-12-19 22:18:22 +00:00
parent 8390ae9b11
commit 199a90214b
1 changed files with 55 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
lucene/test-framework/src/java/org/apache/lucene/mockfile/HandleTrackingFS.java
View File

@ -93,9 +93,15 @@ public abstract class HandleTrackingFS extends FilterFileSystemProvider {
@Override
public InputStream newInputStream(Path path, OpenOption... options) throws IOException {
InputStream stream = new FilterInputStream2(super.newInputStream(path, options)) {
boolean closed;
@Override
public void close() throws IOException {
onClose(path, this);
if (!closed) {
closed = true;
onClose(path, this);
}
super.close();
}
@ -121,9 +127,15 @@ public abstract class HandleTrackingFS extends FilterFileSystemProvider {
@Override
public OutputStream newOutputStream(final Path path, OpenOption... options) throws IOException {
OutputStream stream = new FilterOutputStream2(super.newOutputStream(path, options)) {
boolean closed;
@Override
public void close() throws IOException {
onClose(path, this);
if (!closed) {
closed = true;
onClose(path, this);
}
super.close();
}
@ -149,9 +161,15 @@ public abstract class HandleTrackingFS extends FilterFileSystemProvider {
@Override
public FileChannel newFileChannel(Path path, Set<? extends OpenOption> options, FileAttribute<?>... attrs) throws IOException {
FileChannel channel = new FilterFileChannel(super.newFileChannel(path, options, attrs)) {
boolean closed;
@Override
protected void implCloseChannel() throws IOException {
onClose(path, this);
if (!closed) {
closed = true;
onClose(path, this);
}
super.implCloseChannel();
}
@ -177,9 +195,15 @@ public abstract class HandleTrackingFS extends FilterFileSystemProvider {
@Override
public AsynchronousFileChannel newAsynchronousFileChannel(Path path, Set<? extends OpenOption> options, ExecutorService executor, FileAttribute<?>... attrs) throws IOException {
AsynchronousFileChannel channel = new FilterAsynchronousFileChannel(super.newAsynchronousFileChannel(path, options, executor, attrs)) {
boolean closed;
@Override
public void close() throws IOException {
onClose(path, this);
if (!closed) {
closed = true;
onClose(path, this);
}
super.close();
}
@ -205,9 +229,15 @@ public abstract class HandleTrackingFS extends FilterFileSystemProvider {
@Override
public SeekableByteChannel newByteChannel(Path path, Set<? extends OpenOption> options, FileAttribute<?>... attrs) throws IOException {
SeekableByteChannel channel = new FilterSeekableByteChannel(super.newByteChannel(path, options, attrs)) {
boolean closed;
@Override
public void close() throws IOException {
onClose(path, this);
if (!closed) {
closed = true;
onClose(path, this);
}
super.close();
}
@ -237,9 +267,15 @@ public abstract class HandleTrackingFS extends FilterFileSystemProvider {
stream = new TrackingSecureDirectoryStream((SecureDirectoryStream<Path>)stream, dir);
} else {
stream = new FilterDirectoryStream<Path>(stream) {
boolean closed;
@Override
public void close() throws IOException {
onClose(dir, this);
if (!closed) {
closed = true;
onClose(dir, this);
}
super.close();
}
@ -271,10 +307,15 @@ public abstract class HandleTrackingFS extends FilterFileSystemProvider {
super(delegate);
this.dir = dir;
}
boolean closed;
@Override
public void close() throws IOException {
onClose(dir, this);
if (!closed) {
closed = true;
onClose(dir, this);
}
super.close();
}
@ -303,9 +344,15 @@ public abstract class HandleTrackingFS extends FilterFileSystemProvider {
@Override
public SeekableByteChannel newByteChannel(Path path, Set<? extends OpenOption> options, FileAttribute<?>... attrs) throws IOException {
SeekableByteChannel channel = new FilterSeekableByteChannel(super.newByteChannel(path, options, attrs)) {
boolean closed;
@Override
public void close() throws IOException {
onClose(path, this);
if (!closed) {
closed = true;
onClose(path, this);
}
super.close();
}