Author: ivaynberg
Date: Fri Sep 23 23:55:16 2011
New Revision: 1175076
URL: http://svn.apache.org/viewvc?rev=1175076&view=rev
Log:
Issue: WICKET-4081
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java?rev=1175076&r1=1175075&r2=1175076&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
Fri Sep 23 23:55:16 2011
@@ -211,14 +211,22 @@ public class ServletWebRequest extends W
@Override
public Time getDateHeader(String name)
{
- long value = httpServletRequest.getDateHeader(name);
+ try
+ {
+ long value = httpServletRequest.getDateHeader(name);
+
+ if (value == -1)
+ {
+ return null;
+ }
- if (value == -1)
+ return Time.millis(value);
+ }
+ catch (IllegalArgumentException e)
{
+ // per spec thrown if the header contains a value that
cannot be converted to a date
return null;
}
-
- return Time.millis(value);
}
@Override
