You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2015/05/18 14:28:49 UTC
svn commit: r1680007 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/test-framework/
lucene/test-framework/src/java/org/apache/lucene/mockfile/HandleTrackingFS.java
lucene/test-framework/src/test/org/apache/lucene/mockfile/TestHandleTrackingFS.java
Author: simonw
Date: Mon May 18 12:28:49 2015
New Revision: 1680007
URL: http://svn.apache.org/r1680007
Log:
LUCENE-6488: Ensure files are closed if onClose/onOpen throws an Exception
Added:
lucene/dev/branches/branch_5x/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestHandleTrackingFS.java
- copied unchanged from r1680005, lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestHandleTrackingFS.java
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/mockfile/HandleTrackingFS.java
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/mockfile/HandleTrackingFS.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/mockfile/HandleTrackingFS.java?rev=1680007&r1=1680006&r2=1680007&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/mockfile/HandleTrackingFS.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/mockfile/HandleTrackingFS.java Mon May 18 12:28:49 2015
@@ -96,11 +96,14 @@ public abstract class HandleTrackingFS e
@Override
public void close() throws IOException {
- if (!closed) {
- closed = true;
- onClose(path, this);
+ try {
+ if (!closed) {
+ closed = true;
+ onClose(path, this);
+ }
+ } finally {
+ super.close();
}
- super.close();
}
@Override
@@ -130,11 +133,14 @@ public abstract class HandleTrackingFS e
@Override
public void close() throws IOException {
- if (!closed) {
- closed = true;
- onClose(path, this);
+ try {
+ if (!closed) {
+ closed = true;
+ onClose(path, this);
+ }
+ } finally {
+ super.close();
}
- super.close();
}
@Override
@@ -166,9 +172,12 @@ public abstract class HandleTrackingFS e
protected void implCloseChannel() throws IOException {
if (!closed) {
closed = true;
- onClose(path, this);
+ try {
+ onClose(path, this);
+ } finally {
+ super.implCloseChannel();
+ }
}
- super.implCloseChannel();
}
@Override
@@ -198,11 +207,14 @@ public abstract class HandleTrackingFS e
@Override
public void close() throws IOException {
- if (!closed) {
- closed = true;
- onClose(path, this);
+ try {
+ if (!closed) {
+ closed = true;
+ onClose(path, this);
+ }
+ } finally {
+ super.close();
}
- super.close();
}
@Override
@@ -232,11 +244,14 @@ public abstract class HandleTrackingFS e
@Override
public void close() throws IOException {
- if (!closed) {
- closed = true;
- onClose(path, this);
+ try {
+ if (!closed) {
+ closed = true;
+ onClose(path, this);
+ }
+ } finally {
+ super.close();
}
- super.close();
}
@Override
@@ -273,11 +288,14 @@ public abstract class HandleTrackingFS e
@Override
public void close() throws IOException {
- if (!closed) {
- closed = true;
- onClose(dir, this);
+ try {
+ if (!closed) {
+ closed = true;
+ onClose(dir, this);
+ }
+ } finally {
+ super.close();
}
- super.close();
}
@Override