opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16' into stable-3.0

Browse Source 
* stable-2.16:
  Redirect GWT links to project dashboard to Polygerit
  Doc: Make command for configuring bazel copyable
  Update git submodules
  ChangeEdits: Don't wrap Response.none() in Response.ok()
  Document how to mitigate the issue of broken Eclipse project on MacOS

Change-Id: I83f3a5dca383ba8d8042b7f679481ab091f45e6c
This commit is contained in:
Marco Miller
2020-08-28 13:09:26 -04:00
parent b5aac59baf f0b9d5e51f
commit ddd6c00b3c
5 changed files with 56 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/google/gerrit/server/restapi/change/ChangeEdits.java
View File

@@ -305,7 +305,7 @@ public class ChangeEdits implements ChildCollection<ChangeResource, ChangeEditRe
EditMessage.Input editCommitMessageInput = new EditMessage.Input();
editCommitMessageInput.message =
new String(ByteStreams.toByteArray(newContent.getInputStream()), UTF_8);
return Response.ok(editMessage.apply(rsrc, editCommitMessageInput));
return editMessage.apply(rsrc, editCommitMessageInput);
}
if (Strings.isNullOrEmpty(path) || path.charAt(0) == '/') {
throw new ResourceConflictException("Invalid path: " + path);
@@ -446,7 +446,7 @@ public class ChangeEdits implements ChildCollection<ChangeResource, ChangeEditRe
}
@Override
public Object apply(ChangeResource rsrc, Input input)
public Response<?> apply(ChangeResource rsrc, Input input)
throws AuthException, IOException, BadRequestException, ResourceConflictException,
PermissionBackendException {
if (input == null || Strings.isNullOrEmpty(input.message)) {