opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  PutConfig: add cause to ResourceConflictException
  RestSession: Remove unnecessary utility methods

Change-Id: I3f099f905f3ef31a904e0fc823f3f40f09c4af31
This commit is contained in:
David Pursehouse
2018-07-24 21:40:07 +01:00
parent e978e864e6 1e75093ffe
commit a930b923e7
3 changed files with 23 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java
View File

@@ -190,7 +190,7 @@ public class PutConfig implements RestModifyView<ProjectResource, ConfigInput> {
"Cannot update " + projectName + ": " + e.getCause().getMessage());
}
log.warn("Failed to update config of project {}.", projectName, e);
throw new ResourceConflictException("Cannot update " + projectName);
throw new ResourceConflictException("Cannot update " + projectName, e);
}
ProjectState state = projectStateFactory.create(projectConfig);