From c85ea934b79cc759a524394dc0ac482bbe509371 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Mon, 14 Sep 2009 11:30:13 +0000
Subject: [PATCH] Removed hard-coded modified time when streaming a physical
 file as webscript content  - Whose birthday is "1975, 3, 26" :-)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16250 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repo/web/scripts/content/StreamContent.java | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/source/java/org/alfresco/repo/web/scripts/content/StreamContent.java b/source/java/org/alfresco/repo/web/scripts/content/StreamContent.java
index 3defc9b7a7..2bd6034992 100644
--- a/source/java/org/alfresco/repo/web/scripts/content/StreamContent.java
+++ b/source/java/org/alfresco/repo/web/scripts/content/StreamContent.java
@@ -32,7 +32,6 @@ import java.io.Writer;
 import java.net.SocketException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Locale;
@@ -89,7 +88,7 @@ public class StreamContent extends AbstractWebScript
     protected MimetypeService mimetypeService;    
     
     /** Cached file modified date */
-    private Date resouceFileModifiedDate;
+//    private Date resouceFileModifiedDate;
 
     /**
      * @param mimetypeService
@@ -466,21 +465,15 @@ public class StreamContent extends AbstractWebScript
             }
         }
         
-        // Create a date in the past
-        if (this.resouceFileModifiedDate == null)
-        {
-            Calendar calendar = Calendar.getInstance();
-            calendar.set(1975, 3, 26);
-            this.resouceFileModifiedDate = calendar.getTime();
-        }      
-        
         // setup file reader and stream
         FileContentReader reader = new FileContentReader(file);
         reader.setMimetype(mimetype);
         reader.setEncoding("UTF-8");
         
-        streamContentImpl(req, res, reader, attach, this.resouceFileModifiedDate, 
-                    String.valueOf(this.resouceFileModifiedDate.getTime()), attachFileName);
+        Date lastModified = new Date(file.lastModified());
+        
+        streamContentImpl(req, res, reader, attach, lastModified, 
+                    String.valueOf(lastModified.getTime()), attachFileName);
     }
     
     /**