[jboss-svn-commits] JBL Code SVN: r19544 - 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 04:05:00 -0400 (Mon, 14 Apr 2008)
New Revision: 19544

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

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 07:09:50 UTC (rev 19543)
+++ labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java	2008-04-14 08:05:00 UTC (rev 19544)
@@ -121,10 +121,9 @@
                 response.setDateHeader("Last-Modified", requestedNode.getLastModification());
                 
                 if (requestedNode.getMimeType().startsWith("image")) {
-                    //response.setDateHeader("Expires", farOffDate); 
-                    response.setDateHeader("Expires", requestedNode.getLastModification()+1);
+                    response.setDateHeader("Expires", farOffDate); 
                 } else {
-                    response.setDateHeader("Expires", requestedNode.getLastModification()+1);
+                    response.setDateHeader("Expires", System.currentTimeMillis()+1000*60);
                 }
 
                 long ifModifiedSince = request.getDateHeader("If-modified-since");
@@ -133,7 +132,6 @@
                 	response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
                 	response.setContentLength(0);
                 	response.setContentType(requestedNode.getMimeType());
-                	System.out.println("REQUEST FOR A SHOTOKU NODE, nod modified: " + path);
                 	
                 	return;
                 }
@@ -152,7 +150,6 @@
 
             // Transferring the bytes
             try {
-            	System.out.println("REQUEST FOR A SHOTOKU NODE, transferring: " + path);
                 Tools.transfer(ci.getIs(), os);
             } finally {
                 try {