commit 038a8cb926f38eda0cb0efed8ee0a654ada632ff
author Dave Borowitz <dborowitz@google.com> Thu Sep 10 09:50:35 2015 -0400
committer Dave Borowitz <dborowitz@google.com> Thu Sep 10 09:50:35 2015 -0400
tree 03844fa28916bec8960e61b155ac37e492195ddc
parent 26aa9ba73d3dabebccf822ba23112f830066ac01

MergeOp: Avoid NPE in submittable check when PS is missing

Change-Id: Iabe3187a3faf33102020f149f7b46dfd0df79173

gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
index 3bfa47e..121f37b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
@@ -229,6 +229,10 @@
   public static List<SubmitRecord> checkSubmitRule(ChangeData cd)
       throws ResourceConflictException, OrmException {
     PatchSet patchSet = cd.currentPatchSet();
+    if (patchSet == null) {
+      throw new ResourceConflictException(
+          "missing current patch set for change " + cd.getId());
+    }
     List<SubmitRecord> results = new SubmitRuleEvaluator(cd)
         .setPatchSet(patchSet)
         .evaluate();