opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.12'

Browse Source 
* stable-2.12:
  Update 2.12.4 release notes
  Fix RebaseIfNecessary strategy introducing duplicate commit
  Handle an NPE in ToolsCatalog.java
  Confirm email: Return proper error when email is used by other account
  RestApiServlet: Allow HEAD requests

Change-Id: I15414c40f1136236708cca17128bf60fa020c160
This commit is contained in:
David Pursehouse
2016-08-10 11:31:04 +09:00
parent 49a617ee22 199bbae076
commit 824f55dcbf
7 changed files with 119 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
View File

@@ -326,8 +326,7 @@ public class RestApiServlet extends HttpServlet {
return;
}
if (viewData.view instanceof RestReadView<?>
&& "GET".equals(req.getMethod())) {
if (viewData.view instanceof RestReadView<?> && isGetOrHead(req)) {
result = ((RestReadView<RestResource>) viewData.view).apply(rsrc);
} else if (viewData.view instanceof RestModifyView<?, ?>) {
@SuppressWarnings("unchecked")