Do not close the repository when creating the EMF merge tool
Change-Id: Ie1fc993cefea8b8e4f94e5a0114ed6e5f1150208
diff --git a/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/merge/ModelGitMergeEditorInput.java b/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/merge/ModelGitMergeEditorInput.java
index 2c3ab1c..b7ad71f 100644
--- a/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/merge/ModelGitMergeEditorInput.java
+++ b/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/merge/ModelGitMergeEditorInput.java
@@ -179,8 +179,9 @@
// The merge drivers have done their job of putting the necessary
// information in the index
// Read that info and provide it to the file-specific comparators
- try (final Repository repository = pathsByRepository.keySet().iterator().next();
- RevWalk rw = new RevWalk(repository)) {
+ final Repository repository = pathsByRepository.keySet().iterator().next();
+ RevWalk rw = new RevWalk(repository);
+ try {
final List<String> filterPaths = new ArrayList<String>(pathsByRepository.get(repository));
// get the "right" side (MERGE_HEAD for merge, ORIG_HEAD for rebase)
final RevCommit rightCommit = getRightCommit(rw, repository);
@@ -206,6 +207,7 @@
} catch (IOException e) {
throw new InvocationTargetException(e);
} finally {
+ rw.dispose();
monitor.done();
}
}
