diff options
| author | Marco Miller <marco.mmiller@gmail.com> | 2019-02-20 15:28:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-02-20 15:28:28 +0000 |
| commit | a0bfba8cf2214c97e276ffc5f2863e02e3ac121a (patch) | |
| tree | 6edc5e57409a988acba3c1dbb066d25bc4153fad | |
| parent | b0f5b17be739c6f559eec669168978727d79673b (diff) | |
| parent | d99b848f3a9ec60daf46c466adf6f00d4fbc7b17 (diff) | |
Merge "Allow omitting action in permission removal" into stable-2.15
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/project/SetAccessUtil.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetAccessUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetAccessUtil.java index 848d68cac1..b14008d97a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetAccessUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetAccessUtil.java @@ -100,7 +100,9 @@ public class SetAccessUtil { if (pri.min != null) { r.setMin(pri.min); } - r.setAction(GetAccess.ACTION_TYPE.inverse().get(pri.action)); + if (pri.action != null) { + r.setAction(GetAccess.ACTION_TYPE.inverse().get(pri.action)); + } if (pri.force != null) { r.setForce(pri.force); } |