Assure stream is closed on exception

jenkinsci · Sep 13, 2023 · 65b55c5 · 65b55c5
1 parent 43c38ba
commit 65b55c5
Showing 1 changed file with 2 additions and 13 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/LegacyCompatibleGitAPIImpl.java b/src/main/java/org/jenkinsci/plugins/gitclient/LegacyCompatibleGitAPIImpl.java
@@ -250,10 +250,9 @@ public static File getObjectsFile(File reference) {
  LOGGER.log(
  Level.FINEST,
  "getObjectsFile(): found an fGit '" + fGit.getAbsolutePath() + "' which is NOT a directory");
- BufferedReader reader = null;
- try {
+ try (BufferedReader reader =
+  new BufferedReader(new InputStreamReader(new FileInputStream(fGit), "UTF-8"))) {
  String line;
- reader = new BufferedReader(new InputStreamReader(new FileInputStream(fGit), "UTF-8"));
  while ((line = reader.readLine()) != null) {
  String[] parts = line.split(":", 2);
  if (parts.length >= 2) {
@@ -295,16 +294,6 @@ public static File getObjectsFile(File reference) {
  "getObjectsFile(): failed to parse '" + fGit.getAbsolutePath() + "': " + e.toString());
  objects = null;
  }
- try {
- if (reader != null) {
- reader.close();
- }
- } catch (IOException e) {
- LOGGER.log(
- Level.SEVERE,
- "getObjectsFile(): failed to close file after parsing '" + fGit.getAbsolutePath() + "': "
- + e.toString());
- }
  }
  } else {
  LOGGER.log(Level.FINEST, "getObjectsFile(): did not find any checked-out '" + fGit.getAbsolutePath() + "'");