From 6a380798a27e1ce777843a4322afba463e383acc Mon Sep 17 00:00:00 2001
From: Adrien Grand <jpountz@gmail.com>
Date: Thu, 6 Feb 2020 17:12:49 +0100
Subject: [PATCH] LUCENE-9147: Make sure temporary files get deleted on all
 code paths.

---
 .../lucene/codecs/compressing/FieldsIndexWriter.java   | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/lucene/core/src/java/org/apache/lucene/codecs/compressing/FieldsIndexWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/compressing/FieldsIndexWriter.java
index e67195e2e6e..9feda32dc6f 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/compressing/FieldsIndexWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/compressing/FieldsIndexWriter.java
@@ -80,21 +80,15 @@ public final class FieldsIndexWriter implements Closeable {
     this.blockShift = blockShift;
     this.ioContext = ioContext;
     this.docsOut = dir.createTempOutput(name, codecName + "-doc_ids", ioContext);
-    IndexOutput filePointersOut = null;
     boolean success = false;
     try {
       CodecUtil.writeHeader(docsOut, codecName + "Docs", VERSION_CURRENT);
-      this.filePointersOut = filePointersOut = dir.createTempOutput(name, codecName + "file_pointers", ioContext);
+      filePointersOut = dir.createTempOutput(name, codecName + "file_pointers", ioContext);
       CodecUtil.writeHeader(filePointersOut, codecName + "FilePointers", VERSION_CURRENT);
       success = true;
     } finally {
       if (success == false) {
-        docsOut.close();
-        dir.deleteFile(docsOut.getName());
-        if (filePointersOut != null) {
-          filePointersOut.close();
-          dir.deleteFile(filePointersOut.getName());
-        }
+        close();
       }
     }
   }