opendev/gerrit
Code Issues Proposed changes

MergeabilityCacheImpl: Fix leak of repo handles

Browse Source 
We were failing to clear the LoadHelper (including repo) from the key
in the fast path where we assume changes are mergeable into a new
branch.

Change-Id: I7fc8fa8459fbc43bebf0f0f0d5d69224bef7d93a
This commit is contained in:
Dave Borowitz 2015-08-05 08:42:52 -07:00
parent 596174ec50
commit 75129a2d53
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityCacheImpl.java
View File

@ -220,10 +220,10 @@ public class MergeabilityCacheImpl implements MergeabilityCache {
public Boolean load(EntryKey key)
throws NoSuchProjectException, MergeException, IOException {
checkArgument(key.load != null, "Key cannot be loaded: %s", key);
if (key.into.equals(ObjectId.zeroId())) {
return true; // Assume yes on new branch.
}
try {
if (key.into.equals(ObjectId.zeroId())) {
return true; // Assume yes on new branch.
}
RefDatabase refDatabase = key.load.repo.getRefDatabase();
Iterable<Ref> refs = Iterables.concat(
refDatabase.getRefs(Constants.R_HEADS).values(),