Submit whole topic: Only consider open changes
We only want to look at all open changes. This was lost in the
revision of Ib32a4511a0308da32a8c5d1c7b1a6f124a03576e when porting
over to using InternalChangeQuery.
Change-Id: Ib60fff78e5cd7a6256a94c81d98c6d7bb5b19ac6
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 26f0192..2d1110e 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
@@ -267,7 +267,7 @@
if (submitWholeTopic && !Strings.isNullOrEmpty(topic)) {
List<ChangeData> changesByTopic = null;
try {
- changesByTopic = queryProvider.get().byTopic(topic);
+ changesByTopic = queryProvider.get().byTopicOpen(topic);
} catch (OrmException e) {
throw new OrmRuntimeException(e);
}
@@ -372,7 +372,7 @@
ReviewDb db = dbProvider.get();
db.changes().beginTransaction(change.getId());
- List<ChangeData> changesByTopic = queryProvider.get().byTopic(topic);
+ List<ChangeData> changesByTopic = queryProvider.get().byTopicOpen(topic);
try {
BatchMetaDataUpdate batch = approve(rsrc, update, caller, timestamp);
// Write update commit after all normalized label commits.
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/InternalChangeQuery.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/InternalChangeQuery.java
index c50c3a2..e08847a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/InternalChangeQuery.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/InternalChangeQuery.java
@@ -118,9 +118,9 @@
return query(and(project(project), open()));
}
- public List<ChangeData> byTopic(String topic)
+ public List<ChangeData> byTopicOpen(String topic)
throws OrmException {
- return query(topic(topic));
+ return query(and(topic(topic), open()));
}
private List<ChangeData> query(Predicate<ChangeData> p) throws OrmException {
