Author: pete
Date: Wed Jan 26 18:52:52 2011
New Revision: 1063825
URL: http://svn.apache.org/viewvc?rev=1063825&view=rev
Log:
WICKET-3389: better sanity checking after invocation of resource caching
strategy
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java?rev=1063825&r1=1063824&r2=1063825&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
Wed Jan 26 18:52:52 2011
@@ -30,6 +30,7 @@ import org.apache.wicket.request.resourc
import org.apache.wicket.request.resource.caching.IResourceCachingStrategy;
import org.apache.wicket.util.IProvider;
import org.apache.wicket.util.lang.WicketObjects;
+import org.apache.wicket.util.string.Strings;
/**
* Generic {@link ResourceReference} encoder that encodes and decodes
non-mounted
@@ -94,8 +95,8 @@ class BasicResourceReferenceMapper exten
// related information which needs to
be removed
segment =
getCachingStrategy().sanitizeRequest(segment, pageParameters);
- if (segment == null)
- throw new
NullPointerException("caching strategy must not return null for filename");
+ if (Strings.isEmpty(segment))
+ throw new
NullPointerException("caching strategy must not return an empty filename");
}
if (name.length() > 0)
{
@@ -187,7 +188,7 @@ class BasicResourceReferenceMapper exten
{
token =
getCachingStrategy().decorateRequest(token, parameters, reference);
- if (token == null)
+ if (Strings.isEmpty(token))
throw new
NullPointerException("caching strategy must not return an empty filename");
if (parameters.getIndexedCount() > 0)
