commit 820e8ddc4a5a2948d7af56d9cd72a6ab9f45165b
author Shawn Pearce <sop@google.com> Thu Aug 28 00:25:56 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 28 00:25:56 2014 +0000
tree 2ed635d6c4cb4621771991cfeea64e1ef7a3d04b
parent 7a4cdcd5f85c15996d065ed4860f01b1e6705756
parent 4a159a1edfe8a66672736120774571ae420245d2

Merge topic 'comment-range' into stable-2.9

* changes:
  Replace "line" with "end_line" when range is given in inline comment
  Add example of range comment in REST API documentation

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..481e535 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);
 
@@ -345,10 +350,10 @@
         // change is closed
         return false;
       } catch (Exception e) {
-        String msg = "Failed to update mergeability flags for project "
-            + change.getDest().getParentKey() + " on update of "
-            + change.getDest().get();
-        log.error(msg, e);
+        log.error(String.format(
+            "cannot update mergeability flag of change %d in project %s after update of %s",
+            change.getId().get(),
+            change.getDest().getParentKey(), change.getDest().get()), e);
         throw e;
       } finally {
         tl.setContext(old);