Replace deprecated RevWalk.close()

Use try-with-resources statements instead.

Change-Id: I05ba3440a5c1b55afb2d759088c25ad22bee24e6
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

29 files changed, 63 insertions, 166 deletions

diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/RevUtils.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/RevUtils.java
index 9dc68cd3b2..698252d4d9 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/RevUtils.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/RevUtils.java
@@ -52,8 +52,7 @@ public class RevUtils {
 		Assert.isNotNull(commit1);
 		Assert.isNotNull(commit2);
 
-		RevWalk rw = new RevWalk(repo);
-		try {
+		try (RevWalk rw = new RevWalk(repo)) {
 			rw.setRetainBody(false);
 			rw.setRevFilter(RevFilter.MERGE_BASE);
 
@@ -70,8 +69,6 @@ public class RevUtils {
 			} else {
 				return null;
 			}
-		} finally {
-			rw.release();
 		}
 	}
 
@@ -84,8 +81,7 @@ public class RevUtils {
 	 */
 	public static ConflictCommits getConflictCommits(Repository repository,
 			String path) throws IOException {
-		RevWalk walk = new RevWalk(repository);
-		try {
+		try (RevWalk walk = new RevWalk(repository)) {
 			RevCommit ourCommit;
 			RevCommit theirCommit = null;
 			walk.setTreeFilter(AndTreeFilter.create(PathFilter.create(path),
@@ -117,8 +113,6 @@ public class RevUtils {
 			}
 
 			return new ConflictCommits(ourCommit, theirCommit);
-		} finally {
-			walk.release();
 		}
 	}
 
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/rebase/RebaseInteractivePlan.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/rebase/RebaseInteractivePlan.java
index 58f44231e7..0325416a89 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/rebase/RebaseInteractivePlan.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/rebase/RebaseInteractivePlan.java
@@ -267,12 +267,9 @@ public class RebaseInteractivePlan implements IndexDiffChangedListener,
 	}
 
 	private void reparsePlan() {
-		RevWalk walk = new RevWalk(repository.newObjectReader());
-		try {
+		try (RevWalk walk = new RevWalk(repository.newObjectReader())) {
 			doneList = parseDone(walk);
 			todoList = parseTodo(walk);
-		} finally {
-			walk.release();
 		}
 		planList = JoinedList.wrap(doneList, todoList);
 		notifyPlanWasUpdatedFromRepository();
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CommitOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CommitOperation.java
index e00a0eeb8a..c311b221bf 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CommitOperation.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CommitOperation.java
@@ -311,8 +311,7 @@ public class CommitOperation implements IEGitOperation {
 		PersonIdent authorIdent;
 		if (repo.getRepositoryState().equals(
 				RepositoryState.CHERRY_PICKING_RESOLVED)) {
-			RevWalk rw = new RevWalk(repo);
-			try {
+			try (RevWalk rw = new RevWalk(repo)) {
 				ObjectId cherryPickHead = repo.readCherryPickHead();
 				authorIdent = rw.parseCommit(cherryPickHead)
 						.getAuthorIdent();
@@ -321,8 +320,6 @@ public class CommitOperation implements IEGitOperation {
 						.error(CoreText.CommitOperation_ParseCherryPickCommitFailed,
 								e);
 				throw new IllegalStateException(e);
-			} finally {
-				rw.release();
 			}
 		} else {
 			authorIdent = new PersonIdent(enteredAuthor, commitDate, timeZone);
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/dto/GitSynchronizeData.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/dto/GitSynchronizeData.java
index a27327aeff..17987274a7 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/dto/GitSynchronizeData.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/dto/GitSynchronizeData.java
@@ -165,12 +165,9 @@ public class GitSynchronizeData {
 	 * @throws IOException
 	 */
 	public void updateRevs() throws IOException {
-		ObjectWalk ow = new ObjectWalk(repo);
-		try {
+		try (ObjectWalk ow = new ObjectWalk(repo)) {
 			srcRevCommit = getCommit(srcRev, ow);
 			dstRevCommit = getCommit(dstRev, ow);
-		} finally {
-			ow.release();
 		}
 
 		if (this.dstRevCommit != null && this.srcRevCommit != null)
diff --git a/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/CommitHyperlinkDetector.java b/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/CommitHyperlinkDetector.java
index 34fec85d1d..b5746b52ae 100644
--- a/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/CommitHyperlinkDetector.java
+++ b/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/CommitHyperlinkDetector.java
@@ -123,9 +123,7 @@ public class CommitHyperlinkDetector extends AbstractHyperlinkDetector {
 		}
 
 		private RevCommit getCommit(Repository repository) throws IOException {
-			RevWalk revWalk = null;
-			try {
-				revWalk = new RevWalk(repository);
+			try (RevWalk revWalk = new RevWalk(repository)) {
 				return revWalk.parseCommit(ObjectId.fromString(objectId));
 			} catch (MissingObjectException e) {
 				// ignore
@@ -133,11 +131,7 @@ public class CommitHyperlinkDetector extends AbstractHyperlinkDetector {
 			} catch (IncorrectObjectTypeException e) {
 				// ignore
 				return null;
-			} finally {
-				if (revWalk != null)
-					revWalk.release();
 			}
-
 		}
 
 		@Override
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/search/CommitSearchDialogTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/search/CommitSearchDialogTest.java
index 5ddb45d367..bf02276399 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/search/CommitSearchDialogTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/search/CommitSearchDialogTest.java
@@ -55,13 +55,10 @@ public class CommitSearchDialogTest extends LocalRepositoryTestCase {
 		Activator.getDefault().getRepositoryUtil()
 				.addConfiguredRepository(repository.getDirectory());
 
-		RevWalk walk = new RevWalk(repository);
-		try {
+		try (RevWalk walk = new RevWalk(repository)) {
 			commit = walk.parseCommit(repository.resolve(Constants.HEAD));
 			assertNotNull(commit);
 			walk.parseBody(commit.getParent(0));
-		} finally {
-			walk.release();
 		}
 	}
 
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/search/CommitSearchQueryTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/search/CommitSearchQueryTest.java
index 1ff895c153..93b6e183f1 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/search/CommitSearchQueryTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/search/CommitSearchQueryTest.java
@@ -50,12 +50,9 @@ public class CommitSearchQueryTest extends LocalRepositoryTestCase {
 				.lookupRepository(repoFile);
 		assertNotNull(repository);
 
-		RevWalk walk = new RevWalk(repository);
-		try {
+		try (RevWalk walk = new RevWalk(repository)) {
 			commit = walk.parseCommit(repository.resolve(Constants.HEAD));
 			assertNotNull(commit);
-		} finally {
-			walk.release();
 		}
 	}
 
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorInputFactoryTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorInputFactoryTest.java
index 795efb2c54..0b6af56794 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorInputFactoryTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorInputFactoryTest.java
@@ -51,12 +51,9 @@ public class CommitEditorInputFactoryTest extends LocalRepositoryTestCase {
 				.lookupRepository(repoFile);
 		assertNotNull(repository);
 
-		RevWalk walk = new RevWalk(repository);
-		try {
+		try (RevWalk walk = new RevWalk(repository)) {
 			commit = walk.parseCommit(repository.resolve(Constants.HEAD));
 			assertNotNull(commit);
-		} finally {
-			walk.release();
 		}
 		memento = XMLMemento.createWriteRoot("test");
 	}
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorInputTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorInputTest.java
index 07ffc754dd..a898f12066 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorInputTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorInputTest.java
@@ -45,12 +45,9 @@ public class CommitEditorInputTest extends LocalRepositoryTestCase {
 				.lookupRepository(repoFile);
 		assertNotNull(repository);
 
-		RevWalk walk = new RevWalk(repository);
-		try {
+		try (RevWalk walk = new RevWalk(repository)) {
 			commit = walk.parseCommit(repository.resolve(Constants.HEAD));
 			assertNotNull(commit);
-		} finally {
-			walk.release();
 		}
 	}
 
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorTest.java
index dd8264d994..5a17851b53 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorTest.java
@@ -56,13 +56,10 @@ public class CommitEditorTest extends LocalRepositoryTestCase {
 				.lookupRepository(repoFile);
 		assertNotNull(repository);
 
-		RevWalk walk = new RevWalk(repository);
-		try {
+		try (RevWalk walk = new RevWalk(repository)) {
 			commit = walk.parseCommit(repository.resolve(Constants.HEAD));
 			assertNotNull(commit);
 			walk.parseBody(commit.getParent(0));
-		} finally {
-			walk.release();
 		}
 	}
 
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/DiffStyleRangeFormatterTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/DiffStyleRangeFormatterTest.java
index 57f5093787..a1f7b5616e 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/DiffStyleRangeFormatterTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/DiffStyleRangeFormatterTest.java
@@ -45,13 +45,10 @@ public class DiffStyleRangeFormatterTest extends LocalRepositoryTestCase {
 				.lookupRepository(repoFile);
 		assertNotNull(repository);
 
-		RevWalk walk = new RevWalk(repository);
-		try {
+		try (RevWalk walk = new RevWalk(repository)) {
 			commit = walk.parseCommit(repository.resolve(Constants.HEAD));
 			assertNotNull(commit);
 			walk.parseBody(commit.getParent(0));
-		} finally {
-			walk.release();
 		}
 	}
 
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/RepositoryCommitTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/RepositoryCommitTest.java
index e89682581a..dbe23cba0a 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/RepositoryCommitTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/RepositoryCommitTest.java
@@ -46,12 +46,9 @@ public class RepositoryCommitTest extends LocalRepositoryTestCase {
 				.lookupRepository(repoFile);
 		assertNotNull(repository);
 
-		RevWalk walk = new RevWalk(repository);
-		try {
+		try (RevWalk walk = new RevWalk(repository)) {
 			commit = walk.parseCommit(repository.resolve(Constants.HEAD));
 			assertNotNull(commit);
-		} finally {
-			walk.release();
 		}
 	}
 
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CompareUtils.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CompareUtils.java
index 76cb1c600b..af2c1c9713 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CompareUtils.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CompareUtils.java
@@ -584,17 +584,17 @@ public class CompareUtils {
 			destCommit = getHeadTypedElement(repository, gitPath);
 		else {
 			final ObjectId destCommitId = repository.resolve(refName);
-			RevWalk rw = new RevWalk(repository);
-			RevCommit commit = rw.parseCommit(destCommitId);
-			rw.release();
-			destCommit = getFileRevisionTypedElement(gitPath, commit,
-					repository);
-
-			if (base != null && commit != null) {
-				final ObjectId headCommitId = repository
-						.resolve(Constants.HEAD);
-				commonAncestor = getFileRevisionTypedElementForCommonAncestor(
-						gitPath, headCommitId, destCommitId, repository);
+			try (RevWalk rw = new RevWalk(repository)) {
+				RevCommit commit = rw.parseCommit(destCommitId);
+				destCommit = getFileRevisionTypedElement(gitPath, commit,
+						repository);
+
+				if (base != null && commit != null) {
+					final ObjectId headCommitId = repository
+							.resolve(Constants.HEAD);
+					commonAncestor = getFileRevisionTypedElementForCommonAncestor(
+							gitPath, headCommitId, destCommitId, repository);
+				}
 			}
 		}
 
@@ -845,11 +845,11 @@ public class CompareUtils {
 			typedElement = getHeadTypedElement(repository, gitPath);
 		else {
 			final ObjectId id = repository.resolve(rev);
-			final RevWalk rw = new RevWalk(repository);
-			final RevCommit revCommit = rw.parseCommit(id);
-			rw.release();
-			typedElement = getFileRevisionTypedElement(gitPath,
-					revCommit, repository);
+			try (final RevWalk rw = new RevWalk(repository)) {
+				final RevCommit revCommit = rw.parseCommit(id);
+				typedElement = getFileRevisionTypedElement(gitPath, revCommit,
+						repository);
+			}
 		}
 		return typedElement;
 	}
@@ -919,8 +919,7 @@ public class CompareUtils {
 				return new EmptyTypedElement(""); //$NON-NLS-1$
 
 			RevCommit latestFileCommit;
-			RevWalk rw = new RevWalk(repository);
-			try {
+			try (RevWalk rw = new RevWalk(repository)) {
 				RevCommit headCommit = rw.parseCommit(head.getObjectId());
 				rw.markStart(headCommit);
 				rw.setTreeFilter(AndTreeFilter.create(
@@ -930,8 +929,6 @@ public class CompareUtils {
 				// Fall back to HEAD
 				if (latestFileCommit == null)
 					latestFileCommit = headCommit;
-			} finally {
-				rw.release();
 			}
 
 			return CompareUtils.getFileRevisionTypedElement(repoRelativePath, latestFileCommit, repository);
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/TagActionHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/TagActionHandler.java
index 575eaeab33..3819cf6baa 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/TagActionHandler.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/TagActionHandler.java
@@ -138,14 +138,11 @@ public class TagActionHandler extends RepositoryActionHandler {
 
 	private RevObject getTagTarget(Repository repo, ObjectId objectId)
 			throws IOException {
-		RevWalk rw = new RevWalk(repo);
-		try {
+		try (RevWalk rw = new RevWalk(repo)) {
 			if (objectId == null)
 				return rw.parseAny(repo.resolve(Constants.HEAD));
 			else
 				return rw.parseAny(objectId);
-		} finally {
-			rw.release();
 		}
 	}
 }
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditorInputFactory.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditorInputFactory.java
index 4412c5f582..a36b8e5265 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditorInputFactory.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditorInputFactory.java
@@ -97,8 +97,7 @@ public class CommitEditorInputFactory implements IElementFactory {
 		if (id == null)
 			return null;
 
-		RevWalk walk = new RevWalk(repository);
-		try {
+		try (RevWalk walk = new RevWalk(repository)) {
 			RevCommit commit = walk.parseCommit(ObjectId.fromString(id));
 			for (RevCommit parent : commit.getParents())
 				walk.parseBody(parent);
@@ -110,8 +109,6 @@ public class CommitEditorInputFactory implements IElementFactory {
 			return repositoryCommit;
 		} catch (IOException e) {
 			return null;
-		} finally {
-			walk.release();
 		}
 	}
 
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java
index 69e70b390c..d36c9ac7f2 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java
@@ -468,8 +468,7 @@ public class CompareTreeView extends ViewPart implements IMenuListener, IShowInS
 			return;
 		final RevCommit baseCommit;
 		final RevCommit compareCommit;
-		RevWalk rw = new RevWalk(repo);
-		try {
+		try (RevWalk rw = new RevWalk(repo)) {
 			ObjectId commitId = repo.resolve(compareVersion);
 			compareCommit = commitId != null ? rw.parseCommit(commitId) : null;
 			if (baseVersion == null)
@@ -481,8 +480,6 @@ public class CompareTreeView extends ViewPart implements IMenuListener, IShowInS
 		} catch (IOException e) {
 			Activator.handleError(e.getMessage(), e, true);
 			return;
-		} finally {
-			rw.release();
 		}
 		showBusy(true);
 		try {
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java
index e5700bdb28..2b37b60010 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java
@@ -630,22 +630,19 @@ public class CreateTagDialog extends TitleAreaDialog {
 	}
 
 	private void setExistingTagFromText(String tagName) {
-		RevWalk revWalk = null;
 		try {
 			ObjectId tagObjectId = repo.resolve(Constants.R_TAGS + tagName);
 			if (tagObjectId != null) {
-				revWalk = new RevWalk(repo);
-				RevObject tagObject = revWalk.parseAny(tagObjectId);
-				setExistingTag(tagObject);
+				try (RevWalk revWalk = new RevWalk(repo)) {
+					RevObject tagObject = revWalk.parseAny(tagObjectId);
+					setExistingTag(tagObject);
+				}
 				return;
 			}
 		} catch (IOException e) {
-			// See below
+			// ignore
 		} catch (RevisionSyntaxException e) {
-			// See below
-		} finally {
-			if (revWalk != null)
-				revWalk.release();
+			// ignore
 		}
 		setNoExistingTag();
 	}
@@ -674,8 +671,7 @@ public class CreateTagDialog extends TitleAreaDialog {
 	}
 
 	private void getRevCommits(Collection<RevCommit> commits) {
-		final RevWalk revWalk = new RevWalk(repo);
-		try {
+		try (final RevWalk revWalk = new RevWalk(repo)) {
 			revWalk.sort(RevSort.COMMIT_TIME_DESC, true);
 			revWalk.sort(RevSort.BOUNDARY, true);
 			AnyObjectId headId = repo.resolve(Constants.HEAD);
@@ -692,8 +688,6 @@ public class CreateTagDialog extends TitleAreaDialog {
 		} catch (IOException e) {
 			Activator.logError(UIText.TagAction_errorWhileGettingRevCommits, e);
 			setErrorMessage(UIText.TagAction_errorWhileGettingRevCommits);
-		} finally {
-			revWalk.release();
 		}
 	}
 
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java
index 5ab4a09d49..c6f6bdbbc1 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java
@@ -147,8 +147,7 @@ class FetchResultTable {
 				// else
 				//$FALL-THROUGH$
 			case FAST_FORWARD:
-				RevWalk walk = new RevWalk(reader);
-				try {
+				try (RevWalk walk = new RevWalk(reader)) {
 					walk.setRetainBody(true);
 					walk.markStart(walk.parseCommit(update.getNewObjectId()));
 					walk.markUninteresting(walk.parseCommit(update
@@ -161,8 +160,6 @@ class FetchResultTable {
 				} catch (IOException e) {
 					Activator.logError(
 							"Error parsing commits from fetch result", e); //$NON-NLS-1$
-				} finally {
-					walk.release();
 				}
 				//$FALL-THROUGH$
 			default:
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java
index 7cc232a0c0..2d20960c19 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java
@@ -629,14 +629,12 @@ class CommitGraphTable {
 			IStructuredSelection selection = (IStructuredSelection) table
 					.getSelection();
 			RevCommit commit = (RevCommit) selection.getFirstElement();
-			RevWalk walk = new org.eclipse.jgit.revwalk.RevWalk(input.getRepository());
-			try {
+			try (RevWalk walk = new org.eclipse.jgit.revwalk.RevWalk(
+					input.getRepository())) {
 				return walk.parseCommit(commit.getId());
 			} catch (IOException e) {
 				throw new RuntimeException(
 						"Could not parse commit " + commit.getId(), e); //$NON-NLS-1$
-			} finally {
-				walk.release();
 			}
 		}
 
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GenerateHistoryJob.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GenerateHistoryJob.java
index ec20a29a1b..c06fab9a25 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GenerateHistoryJob.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GenerateHistoryJob.java
@@ -185,7 +185,7 @@ class GenerateHistoryJob extends Job {
 	}
 
 	private void dispose() {
-		walk.release();
+		walk.close();
 		Display.getDefault().asyncExec(new Runnable() {
 
 			public void run() {
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/AbstractHistoryCommandHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/AbstractHistoryCommandHandler.java
index b1e9cf6b91..9866ca3bef 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/AbstractHistoryCommandHandler.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/AbstractHistoryCommandHandler.java
@@ -239,8 +239,7 @@ abstract class AbstractHistoryCommandHandler extends AbstractHandler {
 		if (selection.isEmpty())
 			return Collections.emptyList();
 		List<RevCommit> commits = new ArrayList<RevCommit>();
-		RevWalk walk = new RevWalk(repository);
-		try {
+		try (RevWalk walk = new RevWalk(repository)) {
 			for (Object element : selection.toList()) {
 				RevCommit commit = (RevCommit) element;
 				// Re-parse commit to clear effects of TreeFilter
@@ -249,8 +248,6 @@ abstract class AbstractHistoryCommandHandler extends AbstractHandler {
 			}
 		} catch (IOException e) {
 			throw new ExecutionException(e.getMessage(), e);
-		} finally {
-			walk.release();
 		}
 		return commits;
 	}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitProjectPropertyPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitProjectPropertyPage.java
index 00d2df8606..c1a940c85a 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitProjectPropertyPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitProjectPropertyPage.java
@@ -144,8 +144,7 @@ public class GitProjectPropertyPage extends PropertyPage {
 	}
 
 	private RepositoryCommit getCommit(Repository repository, ObjectId objectId) {
-		RevWalk walk = new RevWalk(repository);
-		try {
+		try (RevWalk walk = new RevWalk(repository)) {
 			RevCommit commit = walk.parseCommit(objectId);
 			for (RevCommit parent : commit.getParents())
 				walk.parseBody(parent);
@@ -154,8 +153,6 @@ public class GitProjectPropertyPage extends PropertyPage {
 			Activator.showError(NLS.bind(
 					UIText.GitProjectPropertyPage_UnableToGetCommit,
 					objectId.name()), e);
-		} finally {
-			walk.release();
 		}
 		return null;
 	}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java
index 152de0bbac..7a76162b66 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java
@@ -275,9 +275,8 @@ public class RebaseInteractiveView extends ViewPart implements
 			private RepositoryCommit loadCommit(
 					AbbreviatedObjectId abbreviatedObjectId) {
 				if (abbreviatedObjectId != null) {
-					RevWalk walk = new RevWalk(
-							RebaseInteractiveView.this.currentRepository);
-					try {
+					try (RevWalk walk = new RevWalk(
+							RebaseInteractiveView.this.currentRepository)) {
 						Collection<ObjectId> resolved = walk.getObjectReader()
 								.resolve(abbreviatedObjectId);
 						if (resolved.size() == 1) {
@@ -289,8 +288,6 @@ public class RebaseInteractiveView extends ViewPart implements
 						}
 					} catch (IOException e) {
 						return null;
-					} finally {
-						walk.release();
 					}
 				}
 				return null;
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java
index c613618d73..44af6c5d91 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java
@@ -351,9 +351,7 @@ public class RebaseResultDialog extends MessageDialog {
 
 		boolean conflictListFailure = false;
 		DirCache dc = null;
-		RevWalk rw = null;
-		try {
-			rw = new RevWalk(repo);
+		try (RevWalk rw = new RevWalk(repo)) {
 			// the commits might not have been fully loaded
 			RevCommit commit = rw.parseCommit(result.getCurrentCommit());
 			commitMessage.getTextWidget().setText(commit.getFullMessage());
@@ -371,8 +369,6 @@ public class RebaseResultDialog extends MessageDialog {
 			// the file list will be empty
 			conflictListFailure = true;
 		} finally {
-			if (rw != null)
-				rw.release();
 			if (dc != null)
 				dc.unlock();
 		}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/ReflogView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/ReflogView.java
index 75c3bbae47..13f681afbb 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/ReflogView.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/ReflogView.java
@@ -205,17 +205,13 @@ public class ReflogView extends ViewPart implements RefsChangedListener, IShowIn
 			}
 
 			private RevCommit getCommit(final ReflogEntry entry) {
-				RevWalk walk = new RevWalk(getRepository());
-				walk.setRetainBody(true);
-				RevCommit c = null;
-				try {
-					c = walk.parseCommit(entry.getNewId());
+				try (RevWalk walk = new RevWalk(getRepository())) {
+					walk.setRetainBody(true);
+					return walk.parseCommit(entry.getNewId());
 				} catch (IOException ignored) {
 					// ignore
-				} finally {
-					walk.release();
+					return null;
 				}
-				return c;
 			}
 		});
 
@@ -301,8 +297,7 @@ public class ReflogView extends ViewPart implements RefsChangedListener, IShowIn
 				Repository repo = getRepository();
 				if (repo == null)
 					return;
-				RevWalk walk = new RevWalk(repo);
-				try {
+				try (RevWalk walk = new RevWalk(repo)) {
 					for (Object element : ((IStructuredSelection)selection).toArray()) {
 						ReflogEntry entry = (ReflogEntry) element;
 						ObjectId id = entry.getNewId();
@@ -314,8 +309,6 @@ public class ReflogView extends ViewPart implements RefsChangedListener, IShowIn
 					}
 				} catch (IOException e) {
 					Activator.logError(UIText.ReflogView_ErrorOnOpenCommit, e);
-				} finally {
-					walk.release();
 				}
 			}
 		};
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/command/AbstractReflogCommandHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/command/AbstractReflogCommandHandler.java
index 278abf9f3b..6d98547519 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/command/AbstractReflogCommandHandler.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/command/AbstractReflogCommandHandler.java
@@ -70,13 +70,10 @@ abstract class AbstractReflogCommandHandler extends AbstractHandler {
 			return null;
 
 		RevCommit commit = null;
-		RevWalk w = new RevWalk(repo);
-		try {
+		try (RevWalk w = new RevWalk(repo)) {
 			commit = w.parseCommit(entry.getNewId());
 		} catch (IOException e) {
 			throw new ExecutionException(e.getMessage(), e);
-		} finally {
-			w.release();
 		}
 		return commit;
 	}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewContentProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewContentProvider.java
index 3981e2669a..7d0464bcfc 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewContentProvider.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewContentProvider.java
@@ -486,9 +486,8 @@ public class RepositoriesViewContentProvider implements ITreeContentProvider,
 			Repository repo) {
 		List<RepositoryTreeNode<Ref>> nodes = new ArrayList<RepositoryTreeNode<Ref>>();
 
-		RevWalk walk = new RevWalk(repo);
-		walk.setRetainBody(true);
-		try {
+		try (RevWalk walk = new RevWalk(repo)) {
+			walk.setRetainBody(true);
 			Map<String, Ref> tagRefs = getRefs(repo, Constants.R_TAGS);
 			for (Ref tagRef : tagRefs.values()) {
 				ObjectId objectId = tagRef.getLeaf().getObjectId();
@@ -500,8 +499,6 @@ public class RepositoriesViewContentProvider implements ITreeContentProvider,
 			}
 		} catch (IOException e) {
 			return handleException(e, parentNode);
-		} finally {
-			walk.release();
 		}
 
 		return nodes.toArray();
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewLabelProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewLabelProvider.java
index afc67a0bd0..842e1ff9d0 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewLabelProvider.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewLabelProvider.java
@@ -179,12 +179,9 @@ public class RepositoriesViewLabelProvider extends ColumnLabelProvider
 					ObjectId id = node.getRepository().resolve(refName);
 					if (id == null)
 						return image;
-					RevWalk rw = new RevWalk(node.getRepository());
-					try {
+					try (RevWalk rw = new RevWalk(node.getRepository())) {
 						RevCommit commit = rw.parseCommit(id);
 						compareString = commit.getId().name();
-					} finally {
-						rw.release();
 					}
 				} else if (refName.equals(Constants.HEAD))
 					return getDecoratedImage(image);
@@ -251,14 +248,11 @@ public class RepositoriesViewLabelProvider extends ColumnLabelProvider
 			id = ref.getObjectId();
 		if (id == null)
 			return null;
-		RevWalk walk = new RevWalk(node.getRepository());
-		walk.setRetainBody(true);
-		try {
+		try (RevWalk walk = new RevWalk(node.getRepository())) {
+			walk.setRetainBody(true);
 			return walk.parseCommit(id);
 		} catch (IOException ignored) {
 			return null;
-		} finally {
-			walk.release();
 		}
 	}
 
@@ -300,17 +294,14 @@ public class RepositoriesViewLabelProvider extends ColumnLabelProvider
 						StyledString.DECORATIONS_STYLER);
 			string.append(']', StyledString.DECORATIONS_STYLER);
 			if (verboseBranchMode && head.getObjectId() != null) {
-				RevWalk walk = new RevWalk(repository);
 				RevCommit commit;
-				try {
+				try (RevWalk walk = new RevWalk(repository)) {
 					commit = walk.parseCommit(head.getObjectId());
 					string.append(' ');
 					string.append(commit.getShortMessage(),
 							StyledString.QUALIFIER_STYLER);
 				} catch (IOException ignored) {
 					// Ignored
-				} finally {
-					walk.release();
 				}
 			}
 		}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/SelectResetTypePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/SelectResetTypePage.java
index 1ff7cd0ea8..d95c21d323 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/SelectResetTypePage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/SelectResetTypePage.java
@@ -98,14 +98,11 @@ public class SelectResetTypePage extends WizardPage {
 		}
 		if (resolved == null)
 			return null;
-		RevWalk walk = new RevWalk(repo);
-		walk.setRetainBody(true);
-		try {
+		try (RevWalk walk = new RevWalk(repo)) {
+			walk.setRetainBody(true);
 			return walk.parseCommit(resolved);
 		} catch (IOException ignored) {
 			return null;
-		} finally {
-			walk.release();
 		}
 	}