[jboss-svn-commits] JBL Code SVN: r19549 - labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess.

[jboss-svn-commits at lists.jboss.org]

Author: adamw
Date: 2008-04-14 10:02:01 -0400 (Mon, 14 Apr 2008)
New Revision: 19549

Modified:
   labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java
Log:


Modified: labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java
===================================================================
--- labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java	2008-04-14 13:53:45 UTC (rev 19548)
+++ labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java	2008-04-14 14:02:01 UTC (rev 19549)
@@ -52,7 +52,9 @@
                 conf.getInitParameter("configFileDirectory"));
         
         Calendar calendar = Calendar.getInstance();
-        calendar.set(2020, 5, 8);
+        calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR)+1);
+        calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH));
+        calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH));
         farOffDate = calendar.getTimeInMillis();
     }
 
@@ -123,7 +125,7 @@
                 if (requestedNode.getMimeType().startsWith("image")) {
                     response.setDateHeader("Expires", farOffDate); 
                 } else {
-                    response.setDateHeader("Expires", System.currentTimeMillis()+1000*60);
+                    response.setDateHeader("Expires", System.currentTimeMillis()+1000*60*10);
                 }
 
                 long ifModifiedSince = request.getDateHeader("If-modified-since");