diff options
| author | Robert Newson <rnewson@apache.org> | 2023-03-21 18:40:14 +0000 |
|---|---|---|
| committer | Robert Newson <rnewson@apache.org> | 2023-03-27 17:39:45 +0100 |
| commit | 4b8af64e6693665d8ae28d9b16b0c0aba83264ab (patch) | |
| tree | d8dbe982559d5b064f0f6f44268c5ebd77b66bf9 | |
| parent | 7feb134a2b18fa0e76db3b46966cd68085a3c1db (diff) | |
| download | couchdb-4b8af64e6693665d8ae28d9b16b0c0aba83264ab.tar.gz | |
always attempt the rollback
2 files changed, 10 insertions, 4 deletions
diff --git a/java/nouveau/lucene4/src/main/java/org/apache/couchdb/nouveau/lucene4/core/Lucene4Index.java b/java/nouveau/lucene4/src/main/java/org/apache/couchdb/nouveau/lucene4/core/Lucene4Index.java index db89d04a2..e829609e1 100644 --- a/java/nouveau/lucene4/src/main/java/org/apache/couchdb/nouveau/lucene4/core/Lucene4Index.java +++ b/java/nouveau/lucene4/src/main/java/org/apache/couchdb/nouveau/lucene4/core/Lucene4Index.java @@ -118,8 +118,11 @@ public class Lucene4Index extends Index<IndexableField> { @Override public void doClose() throws IOException { - searcherManager.close(); - writer.rollback(); + try { + searcherManager.close(); + } finally { + writer.rollback(); + } synchronized (this) { isOpen = false; } diff --git a/java/nouveau/lucene9/src/main/java/org/apache/couchdb/nouveau/lucene9/core/Lucene9Index.java b/java/nouveau/lucene9/src/main/java/org/apache/couchdb/nouveau/lucene9/core/Lucene9Index.java index f1d074576..a80169307 100644 --- a/java/nouveau/lucene9/src/main/java/org/apache/couchdb/nouveau/lucene9/core/Lucene9Index.java +++ b/java/nouveau/lucene9/src/main/java/org/apache/couchdb/nouveau/lucene9/core/Lucene9Index.java @@ -116,8 +116,11 @@ public class Lucene9Index extends Index<IndexableField> { @Override public void doClose() throws IOException { - searcherManager.close(); - writer.rollback(); + try { + searcherManager.close(); + } finally { + writer.rollback(); + } } @Override |