opendev/gerrit
Code Issues Proposed changes

Merge "Make project state check in ADD_PATCH_SET explicit"

Browse Source
This commit is contained in:
Patrick Hiesel
2018-01-12 10:08:20 +00:00
committed by Gerrit Code Review
parent b7934c50bb f83a4e9cbb
commit 8d4403eb28
9 changed files with 60 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/com/google/gerrit/server/git/receive/ReceiveCommits.java
View File

@@ -1037,7 +1037,7 @@ class ReceiveCommits {
// Must pass explicit user instead of injecting a provider into CreateRefControl, since
// Provider<CurrentUser> within ReceiveCommits will always return anonymous.
createRefControl.checkCreateRef(Providers.of(user), rp.getRepository(), branch, obj);
} catch (AuthException denied) {
} catch (AuthException | ResourceConflictException denied) {
reject(cmd, "prohibited by Gerrit: " + denied.getMessage());
return;
}
@@ -2390,6 +2390,10 @@ class ReceiveCommits {
return false;
}
if (!projectState.statePermitsWrite()) {
reject(inputCommand, "cannot add patch set to " + ontoChange + ".");
return false;
}
if (change.getStatus().isClosed()) {
reject(inputCommand, "change " + ontoChange + " closed");
return false;