commit a7ef14229dedc9105dc364e9d771cee093e8de6c
author Shawn Pearce <sop@google.com> Tue Aug 26 14:58:48 2014 -0700
committer Shawn Pearce <sop@google.com> Wed Aug 27 14:21:26 2014 -0700
tree e57fca06214284f43c093054fca409fef8377e38
parent ddb825131b84734b4b1ba421570d3ebb2336df2d

Gracefully skip mergeability checking on broken changes

If a change is missing its current patch set the mergeablity check
will NPE. Skip the check and just return false, indicating there
was no update made to the change.

Change-Id: Ic82b2db1d2f7d27105a06c4082b51e7308f02b04

gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityChecker.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityChecker.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityChecker.java
index 0734d12..1e8ed67 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityChecker.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityChecker.java
@@ -333,6 +333,11 @@
       ReviewDb db = context.getReviewDbProvider().get();
       try {
         PatchSet ps = db.patchSets().get(change.currentPatchSetId());
+        if (ps == null) {
+          // Cannot compute mergeability if current patch set is missing.
+          return false;
+        }
+
         Mergeable m = mergeable.get();
         m.setForce(force);