opendev/gerrit
Code Issues Proposed changes

Fix merging of access sections

Browse Source 
If the same access section is specified multiple times when editing the
access rights, they need to be merged on save. The merging was done
incorrectly so that null was added as permission. This caused a
NullPointerException and the save of the access rights failed.

Change-Id: Ia70c2199fa6c07799ebb325e3391818956248e72
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
Edwin Kempin
2012-05-10 20:00:51 +02:00
parent 189282bac9
commit eb9554f785
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java
View File

@@ -119,7 +119,7 @@ public class AccessSection implements Comparable<AccessSection> {
if (dst != null) {
dst.mergeFrom(src);
} else {
permissions.add(dst);
permissions.add(src);
}
}
}