opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.13'

Browse Source 
* stable-2.13:
  Remove call of ctx.saveChange() from example in plugin documentation
  ProjectWatch: Filter out unrelated projects when getting from index

Change-Id: I3366a98352e3b820343a62630e25e282bb68b138
This commit is contained in:
David Pursehouse
2016-10-28 18:21:13 +09:00
parent 23033b634d b671709b8e
commit c95deaa502
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ProjectWatch.java
View File

@@ -100,7 +100,8 @@ public class ProjectWatch {
Account.Id accountId = a.getAccount().getId(); Account.Id accountId = a.getAccount().getId();
for (Map.Entry<ProjectWatchKey, Set<NotifyType>> e : for (Map.Entry<ProjectWatchKey, Set<NotifyType>> e :
a.getProjectWatches().entrySet()) { a.getProjectWatches().entrySet()) {
if (add(matching, accountId, e.getKey(), e.getValue(), type)) { if (project.equals(e.getKey().project())
&& add(matching, accountId, e.getKey(), e.getValue(), type)) {
// We only want to prevent matching All-Projects if this filter hits // We only want to prevent matching All-Projects if this filter hits
projectWatchers.add(accountId); projectWatchers.add(accountId);
} }
@@ -111,9 +112,11 @@ public class ProjectWatch {
.byWatchedProject(args.allProjectsName)) { .byWatchedProject(args.allProjectsName)) {
for (Map.Entry<ProjectWatchKey, Set<NotifyType>> e : for (Map.Entry<ProjectWatchKey, Set<NotifyType>> e :
a.getProjectWatches().entrySet()) { a.getProjectWatches().entrySet()) {
Account.Id accountId = a.getAccount().getId(); if (args.allProjectsName.equals(e.getKey().project())) {
if (!projectWatchers.contains(accountId)) { Account.Id accountId = a.getAccount().getId();
add(matching, accountId, e.getKey(), e.getValue(), type); if (!projectWatchers.contains(accountId)) {
add(matching, accountId, e.getKey(), e.getValue(), type);
}
} }
} }
} }