commit 0145e70478115d202b16a028ec3da96c9c6fef8e
author Stefan Beller <sbeller@google.com> Fri Feb 06 14:23:43 2015 -0800
committer Stefan Beller <sbeller@google.com> Thu Feb 12 16:02:27 2015 -0800
tree 46f6d5b32d84c0979b13d4f3cd82572a0822129e
parent 252d769b51d5248ebedb32f6773dd3dd30e2bf62

Submit whole topic: check if all changes are submittable

We were checking only if the current change was submittable, but we
really need to check all changes.

Change-Id: Ief424e7bd32f5d552b3adc18fc3c7c2ff7c46df2

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

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java
index cadd55c..86ce3b99 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java
@@ -391,16 +391,20 @@
     ReviewDb db = dbProvider.get();
     ChangeData cd = changeDataFactory.create(db, rsrc.getControl());
 
-    List<SubmitRecord> submitRecords = checkSubmitRule(cd,
-        rsrc.getPatchSet(), force);
+    List<ChangeData> changesByTopic = queryProvider.get().byTopicOpen(topic);
+    String problems = problemsForSubmittingChanges(changesByTopic, caller);
+    if (problems != null) {
+      throw new ResourceConflictException(problems);
+    }
 
     Change change = rsrc.getChange();
     ChangeUpdate update = updateFactory.create(rsrc.getControl(), timestamp);
+
+    List<SubmitRecord> submitRecords = checkSubmitRule(cd,
+        rsrc.getPatchSet(), force);
     update.submit(submitRecords);
 
     db.changes().beginTransaction(change.getId());
-
-    List<ChangeData> changesByTopic = queryProvider.get().byTopicOpen(topic);
     try {
       BatchMetaDataUpdate batch = approve(rsrc, update, caller, timestamp);
       // Write update commit after all normalized label commits.