Small cleanup in ShardGetService (elastic#89578)

We can use try-with-resources here, and remove a null check because IndexShard.get never returns null.
AbeleMM · Aug 24, 2022 · 5422860 · 5422860
1 parent 0aa0477
commit 5422860
Showing 1 changed file with 11 additions and 18 deletions.
diff --git a/server/src/main/java/org/elasticsearch/index/get/ShardGetService.java b/server/src/main/java/org/elasticsearch/index/get/ShardGetService.java
@@ -199,26 +199,19 @@ private GetResult innerGet(
         boolean forceSyntheticSource
     ) throws IOException {
         fetchSourceContext = normalizeFetchSourceContent(fetchSourceContext, gFields);
-
-        Engine.GetResult get = indexShard.get(
-            new Engine.Get(realtime, realtime, id).version(version)
-                .versionType(versionType)
-                .setIfSeqNo(ifSeqNo)
-                .setIfPrimaryTerm(ifPrimaryTerm)
-        );
-        if (get.exists() == false) {
-            get.close();
-        }
-
-        if (get == null || get.exists() == false) {
-            return new GetResult(shardId.getIndexName(), id, UNASSIGNED_SEQ_NO, UNASSIGNED_PRIMARY_TERM, -1, false, null, null, null);
-        }
-
-        try {
+        try (
+            Engine.GetResult get = indexShard.get(
+                new Engine.Get(realtime, realtime, id).version(version)
+                    .versionType(versionType)
+                    .setIfSeqNo(ifSeqNo)
+                    .setIfPrimaryTerm(ifPrimaryTerm)
+            )
+        ) {
+            if (get.exists() == false) {
+                return new GetResult(shardId.getIndexName(), id, UNASSIGNED_SEQ_NO, UNASSIGNED_PRIMARY_TERM, -1, false, null, null, null);
+            }
             // break between having loaded it from translog (so we only have _source), and having a document to load
             return innerGetFetch(id, gFields, fetchSourceContext, get, forceSyntheticSource);
-        } finally {
-            get.close();
         }
     }