From d6692d54a96fe58699213e881c39227666729b5a Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 2 Apr 2015 01:21:55 +0200 Subject: [PATCH] Use try-with-resource to close resources in BlobBasedConfig Change-Id: Idb890788a88049d07326cd48e7c5534148f18e32 Signed-off-by: Matthias Sohn --- .../src/org/eclipse/jgit/lib/BlobBasedConfig.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BlobBasedConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BlobBasedConfig.java index a0197d022..cbb2f5b85 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BlobBasedConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BlobBasedConfig.java @@ -104,11 +104,8 @@ public BlobBasedConfig(Config base, Repository db, AnyObjectId objectId) private static byte[] read(Repository db, AnyObjectId blobId) throws MissingObjectException, IncorrectObjectTypeException, IOException { - ObjectReader or = db.newObjectReader(); - try { + try (ObjectReader or = db.newObjectReader()) { return read(or, blobId); - } finally { - or.release(); } } @@ -146,15 +143,12 @@ public BlobBasedConfig(Config base, Repository db, AnyObjectId treeish, private static byte[] read(Repository db, AnyObjectId treeish, String path) throws MissingObjectException, IncorrectObjectTypeException, IOException { - ObjectReader or = db.newObjectReader(); - try { + try (ObjectReader or = db.newObjectReader()) { TreeWalk tree = TreeWalk.forPath(or, path, asTree(or, treeish)); if (tree == null) throw new FileNotFoundException(MessageFormat.format(JGitText .get().entryNotFoundByPath, path)); return read(or, tree.getObjectId(0)); - } finally { - or.release(); } } @@ -168,6 +162,8 @@ private static AnyObjectId asTree(ObjectReader or, AnyObjectId treeish) && ((RevCommit) treeish).getTree() != null) return ((RevCommit) treeish).getTree(); - return new RevWalk(or).parseTree(treeish).getId(); + try (RevWalk rw = new RevWalk(or)) { + return rw.parseTree(treeish).getId(); + } } }