diff options
Diffstat (limited to 'java/com/google/gerrit/server/git/validators/MergeValidators.java')
-rw-r--r-- | java/com/google/gerrit/server/git/validators/MergeValidators.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/com/google/gerrit/server/git/validators/MergeValidators.java b/java/com/google/gerrit/server/git/validators/MergeValidators.java index 325de5b99c..811e960a34 100644 --- a/java/com/google/gerrit/server/git/validators/MergeValidators.java +++ b/java/com/google/gerrit/server/git/validators/MergeValidators.java @@ -196,9 +196,9 @@ public class MergeValidators { if (!oldParent.equals(newParent)) { if (!allowProjectOwnersToChangeParent) { try { - permissionBackend.user(caller).check(GlobalPermission.ADMINISTRATE_SERVER); - } catch (AuthException e) { - throw new MergeValidationException(SET_BY_ADMIN, e); + if (!permissionBackend.user(caller).test(GlobalPermission.ADMINISTRATE_SERVER)) { + throw new MergeValidationException(SET_BY_ADMIN); + } } catch (PermissionBackendException e) { logger.atWarning().withCause(e).log("Cannot check ADMINISTRATE_SERVER"); throw new MergeValidationException("validation unavailable", e); @@ -236,7 +236,7 @@ public class MergeValidators { String oldValue = destProject.getPluginConfig(e.getPluginName()).getString(e.getExportName()); - if ((!Objects.equals(value, oldValue)) && !configEntry.isEditable(destProject)) { + if (!Objects.equals(value, oldValue) && !configEntry.isEditable(destProject)) { throw new MergeValidationException(PLUGIN_VALUE_NOT_EDITABLE); } |