Updated Branches: refs/heads/wicket-1.5.x 0b76b9730 -> 5e4c1fda0
WICKET-4380: check for possible null-url on missing file Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5e4c1fda Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5e4c1fda Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5e4c1fda Branch: refs/heads/wicket-1.5.x Commit: 5e4c1fda04bda9b012d1bc31b940b231aa82d0d3 Parents: 0b76b97 Author: Emond Papegaaij <[email protected]> Authored: Wed Feb 8 12:43:19 2012 +0100 Committer: Emond Papegaaij <[email protected]> Committed: Wed Feb 8 12:43:19 2012 +0100 ---------------------------------------------------------------------- .../util/resource/WebExternalResourceStream.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/5e4c1fda/wicket-core/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java b/wicket-core/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java index 931d7bc..7ffeef4 100644 --- a/wicket-core/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java +++ b/wicket-core/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java @@ -16,8 +16,10 @@ */ package org.apache.wicket.util.resource; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; +import java.net.URL; import javax.servlet.ServletContext; @@ -79,8 +81,14 @@ public class WebExternalResourceStream extends AbstractResourceStream try { final ServletContext context = ((WebApplication)Application.get()).getServletContext(); + final URL resourceURL = context.getResource(url); + if (resourceURL == null) + { + throw new FileNotFoundException("Unable to find resource '" + url + + "' in the serlvet context"); + } - return Connections.getLastModified(context.getResource(url)); + return Connections.getLastModified(resourceURL); } catch (IOException e) {
