Browse Source

IndexDiff: Refactor to open Repository in try-with-resource

Change-Id: I667d685ccedc730e786f1e52323fdeba4b91af3e
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
stable-5.0
David Pursehouse 7 years ago
parent
commit
5639639b06
  1. 5
      org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java

5
org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java

@ -542,10 +542,9 @@ public class IndexDiff {
JGitText.get().invalidIgnoreParamSubmodule, JGitText.get().invalidIgnoreParamSubmodule,
smw.getPath()), e); smw.getPath()), e);
} }
Repository subRepo = smw.getRepository(); try (Repository subRepo = smw.getRepository()) {
if (subRepo != null) { if (subRepo != null) {
String subRepoPath = smw.getPath(); String subRepoPath = smw.getPath();
try {
ObjectId subHead = subRepo.resolve("HEAD"); //$NON-NLS-1$ ObjectId subHead = subRepo.resolve("HEAD"); //$NON-NLS-1$
if (subHead != null if (subHead != null
&& !subHead.equals(smw.getObjectId())) { && !subHead.equals(smw.getObjectId())) {
@ -574,8 +573,6 @@ public class IndexDiff {
recordFileMode(subRepoPath, FileMode.GITLINK); recordFileMode(subRepoPath, FileMode.GITLINK);
} }
} }
} finally {
subRepo.close();
} }
} }
} }

Loading…
Cancel
Save