opendev/gerrit
Code Issues Proposed changes

Merge "Ensure that RevWalk in SubmoduleOp is released"

Browse Source
This commit is contained in:
Shawn Pearce
2012-10-21 10:29:36 -07:00
committed by Gerrit Code Review
parent 1915b91937 5ba1f4276f
commit b65bebc5f2
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleOp.java
View File

@@ -365,7 +365,7 @@ public class SubmoduleOp {
private static DirCache readTree(final Repository pdb, final Ref branch) private static DirCache readTree(final Repository pdb, final Ref branch)
throws MissingObjectException, IncorrectObjectTypeException, IOException { throws MissingObjectException, IncorrectObjectTypeException, IOException {
final RevWalk rw = new RevWalk(pdb); final RevWalk rw = new RevWalk(pdb);
try {
final DirCache dc = DirCache.newInCore(); final DirCache dc = DirCache.newInCore();
final DirCacheBuilder b = dc.builder(); final DirCacheBuilder b = dc.builder();
b.addTree(new byte[0], // no prefix path b.addTree(new byte[0], // no prefix path
@@ -373,6 +373,9 @@ public class SubmoduleOp {
pdb.newObjectReader(), rw.parseTree(branch.getObjectId())); pdb.newObjectReader(), rw.parseTree(branch.getObjectId()));
b.finish(); b.finish();
return dc; return dc;
} finally {
rw.release();
}
} }
private static void logAndThrowSubmoduleException(final String errorMsg, private static void logAndThrowSubmoduleException(final String errorMsg,