opendev/gerrit
Code Issues Proposed changes

Merge 'v2.4.2'

Browse Source 
* v2.4.2:
  Release notes for 2.4.2
  Release notes for 2.3.1
  Release notes for 2.2.2.2
  Fix permissions bug caused by directly inheriting from All-Projects

Change-Id: Iecd10b7b16ebda71bf88b600e73e09f147303009
This commit is contained in:
Shawn O. Pearce
2012-06-21 16:38:26 -07:00
parent b1003300c7 d2cacd1738
commit b527429704
7 changed files with 104 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java
View File

@@ -214,6 +214,7 @@ public class ProjectState {
List<SectionMatcher> all = new ArrayList<SectionMatcher>();
Set<Project.NameKey> seen = new HashSet<Project.NameKey>();
ProjectState allProjects = projectCache.getAllProjects();
seen.add(getProject().getNameKey());
ProjectState s = this;
@@ -226,7 +227,9 @@ public class ProjectState {
}
s = projectCache.get(parent);
} while (s != null);
all.addAll(projectCache.getAllProjects().getLocalAccessSections());
if (seen.add(allProjects.getProject().getNameKey())) {
all.addAll(allProjects.getLocalAccessSections());
}
return all;
}