WW-4622 - getRealPath NPE check
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b6a7a0e3 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b6a7a0e3 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b6a7a0e3 Branch: refs/heads/master Commit: b6a7a0e38a71707523517fa33570955c182e7bdc Parents: e53a340 Author: Aleksandr Mashchenko <amashche...@apache.org> Authored: Wed Apr 6 19:39:39 2016 +0300 Committer: Aleksandr Mashchenko <amashche...@apache.org> Committed: Wed Apr 6 19:39:39 2016 +0300 ---------------------------------------------------------------------- .../tiles/StrutsWildcardServletApplicationContext.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/b6a7a0e3/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java ---------------------------------------------------------------------- diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java index 70a21ed..df6152b 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java @@ -54,8 +54,12 @@ public class StrutsWildcardServletApplicationContext extends ServletApplicationC for (Object path : context.getResourcePaths("/")) { try { - URL url = new File(context.getRealPath(String.valueOf(path))).toURI().toURL(); - urls.add(url); + String realPath = context.getRealPath(String.valueOf(path)); + + if (realPath != null) { + URL url = new File(realPath).toURI().toURL(); + urls.add(url); + } } catch (MalformedURLException e) { throw new ConfigurationException(e); }
