opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.12'

Browse Source 
* stable-2.12:
  Update URLs for bouncycastle
  Update URLs for bouncycastle
  ResourceServlet#getResource(): Prevent NPE in Guava cache

Change-Id: I2e2bcf5dd8e62eec4263a81b621f9642c0f04795
This commit is contained in:
David Pursehouse
2016-04-14 09:41:49 +09:00
parent bc23fd66fd e8b75cbaee
commit 7fcec27ea6
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ResourceServlet.java
View File

@@ -205,6 +205,10 @@ public abstract class ResourceServlet extends HttpServlet {
Resource getResource(String name) { Resource getResource(String name) {
try { try {
Path p = getResourcePath(name); Path p = getResourcePath(name);
if (p == null) {
log.warn(String.format("Path doesn't exist %s", name));
return null;
}
return cache.get(p, newLoader(p)); return cache.get(p, newLoader(p));
} catch (ExecutionException | IOException e) { } catch (ExecutionException | IOException e) {
log.warn(String.format("Cannot load static resource %s", name), e); log.warn(String.format("Cannot load static resource %s", name), e);