Skip to content

Commit 3591da6

Browse files
committed
Simplify FrozenEngine#getReader (#39539)
We really don’t need a try/finally in this method.
1 parent 7da62d3 commit 3591da6

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/index/engine/FrozenEngine.java

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -186,20 +186,11 @@ private synchronized DirectoryReader getOrOpenReader() throws IOException {
186186
}
187187

188188
@SuppressForbidden(reason = "we manage references explicitly here")
189-
private synchronized DirectoryReader getReader() throws IOException {
190-
DirectoryReader reader = null;
191-
boolean success = false;
192-
try {
193-
if (lastOpenedReader != null && lastOpenedReader.tryIncRef()) {
194-
reader = lastOpenedReader;
195-
}
196-
success = true;
197-
return reader;
198-
} finally {
199-
if (success == false) {
200-
IOUtils.close(reader);
201-
}
189+
private synchronized DirectoryReader getReader() {
190+
if (lastOpenedReader != null && lastOpenedReader.tryIncRef()) {
191+
return lastOpenedReader;
202192
}
193+
return null;
203194
}
204195

205196
@Override

0 commit comments

Comments
 (0)