opendev/gerrit
Code Issues Proposed changes

Merge "add null check to patchset object while creating descendent changes." into stable-2.6

Browse Source
This commit is contained in:
Shawn Pearce
2013-04-03 03:59:23 +00:00
committed by Gerrit Code Review
parent 1859a247e4 41642e0eb6
commit 0958bc7228
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java
View File

@@ -188,11 +188,24 @@ public class EventFactory {
} }
} }
final RevId revId = db.patchSets().get(psId).getRevision(); final PatchSet ps = db.patchSets().get(psId);
for (PatchSetAncestor a : db.patchSetAncestors().descendantsOf(revId)) { if (ps == null) {
final PatchSet p = db.patchSets().get(a.getPatchSet()); log.error("Error while generating the list of descendants for"
final Change c = db.changes().get(p.getId().getParentKey()); + " PatchSet " + psId + ": Cannot find PatchSet entry in"
ca.neededBy.add(newNeededBy(c, p)); + " database.");
} else {
final RevId revId = ps.getRevision();
for (PatchSetAncestor a : db.patchSetAncestors().descendantsOf(revId)) {
final PatchSet p = db.patchSets().get(a.getPatchSet());
if (p == null) {
log.error("Error while generating the list of descendants for"
+ " revision " + revId.get() + ": Cannot find PatchSet entry in"
+ " database for " + a.getPatchSet());
continue;
}
final Change c = db.changes().get(p.getId().getParentKey());
ca.neededBy.add(newNeededBy(c, p));
}
} }
} finally { } finally {
db.close(); db.close();