opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.12'

Browse Source 
* stable-2.12:
  ProjectConfig: Use conditional-and (&&) instead of bitwise-and (&)

Change-Id: Ifab48dba4ea0b835669965ebf1b83e8dcffdef00
This commit is contained in:
David Pursehouse
2016-05-12 19:45:28 +09:00
parent dd4739e3c1 0fd348ca7b
commit 1b0ef922dd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java
View File

@@ -575,7 +575,7 @@ public class ProjectConfig extends VersionedMetaData implements ValidationError.
Config rc, Map<String, GroupReference> groupsByName) { Config rc, Map<String, GroupReference> groupsByName) {
accessSections = new HashMap<>(); accessSections = new HashMap<>();
for (String refName : rc.getSubsections(ACCESS)) { for (String refName : rc.getSubsections(ACCESS)) {
if (RefConfigSection.isValid(refName) & isValidRegex(refName)) { if (RefConfigSection.isValid(refName) && isValidRegex(refName)) {
AccessSection as = getAccessSection(refName, true); AccessSection as = getAccessSection(refName, true);
for (String varName : rc.getStringList(ACCESS, refName, KEY_GROUP_PERMISSIONS)) { for (String varName : rc.getStringList(ACCESS, refName, KEY_GROUP_PERMISSIONS)) {