Author: dashorst
Date: Tue Jul 19 13:57:59 2011
New Revision: 1148329
URL: http://svn.apache.org/viewvc?rev=1148329&view=rev
Log:
Also fixed the mapRequest() method
Issue: WICKET-3918
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=1148329&r1=1148328&r2=1148329&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
Tue Jul 19 13:57:59 2011
@@ -106,7 +106,7 @@ class BasicResourceReferenceMapper exten
if (Strings.isEmpty(segment))
{
log.debug("Caching strategy {}
returned an empty name, not mapping {}",
-
getCachingStrategy().getClass(), url);
+
getCachingStrategy().getClass().getName(), url);
return null;
}
}
@@ -211,8 +211,11 @@ class BasicResourceReferenceMapper exten
token =
resourceUrl.getFileName();
if (Strings.isEmpty(token))
- throw new
NullPointerException(
- "caching
strategy must not return an empty filename");
+ {
+ log.debug("Caching
strategy {} returned an empty name, not mapping {}",
+
getCachingStrategy().getClass().getName(), url);
+ return null;
+ }
if
(parameters.getIndexedCount() > 0)
throw new
IllegalStateException(
