diff options
author | David Pursehouse <david.pursehouse@sonymobile.com> | 2015-04-13 14:53:21 +0900 |
---|---|---|
committer | David Pursehouse <david.pursehouse@sonymobile.com> | 2015-04-15 00:32:08 +0000 |
commit | b4c5a0e23ff66375762e58ed0c9a6c1e13e201f4 (patch) | |
tree | ccf0a6f80a38bffc06fe5b159edc6762a5808609 | |
parent | d92fb7b037ba49a30b1faa80beddfcef40759f98 (diff) |
Fix NPE in GitWebServlet
Bug: Issue 3289
Change-Id: I6c2a9e231343c3790ec913e1bf5de37f319d616a
-rw-r--r-- | gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebServlet.java | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebServlet.java index 8f0a2025a6..3b4c9985fe 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebServlet.java @@ -360,15 +360,18 @@ class GitWebServlet extends HttpServlet { } final Map<String, String> params = getParameters(req); - if (deniedActions.contains(params.get("a"))) { - rsp.sendError(HttpServletResponse.SC_FORBIDDEN); - return; - } + String a = params.get("a"); + if (a != null) { + if (deniedActions.contains(a)) { + rsp.sendError(HttpServletResponse.SC_FORBIDDEN); + return; + } - if (params.get("a").equals(PROJECT_LIST_ACTION)) { - rsp.sendRedirect(req.getContextPath() + "/#" + PageLinks.ADMIN_PROJECTS - + "?filter=" + Url.encode(params.get("pf") + "/")); - return; + if (a.equals(PROJECT_LIST_ACTION)) { + rsp.sendRedirect(req.getContextPath() + "/#" + PageLinks.ADMIN_PROJECTS + + "?filter=" + Url.encode(params.get("pf") + "/")); + return; + } } String name = params.get("p"); |