Author: mgrigorov
Date: Tue May 3 17:30:28 2011
New Revision: 1099146
URL: http://svn.apache.org/viewvc?rev=1099146&view=rev
Log:
WICKET-3665 NullPointerException in ResourceStreamResource when
lastModifiedTime is null
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java?rev=1099146&r1=1099145&r2=1099146&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java
Tue May 3 17:30:28 2011
@@ -26,6 +26,7 @@ import org.apache.wicket.util.lang.Bytes
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.IResourceStreamWriter;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
+import org.apache.wicket.util.time.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -90,7 +91,11 @@ public class ResourceStreamResource exte
protected ResourceResponse newResourceResponse(Attributes attributes)
{
ResourceResponse data = new ResourceResponse();
- data.setLastModified(stream.lastModifiedTime().toDate());
+ Time lastModifiedTime = stream.lastModifiedTime();
+ if (lastModifiedTime != null)
+ {
+ data.setLastModified(lastModifiedTime.toDate());
+ }
// performance check; don't bother to do anything if the
resource is still cached by client
if (data.dataNeedsToBeWritten(attributes))
