inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed hard-coded modified time when streaming a physical file as webscript content

Browse Source 
- 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
This commit is contained in:
Derek Hulley
2009-09-14 11:30:13 +00:00
parent ea394b8138
commit c85ea934b7
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/java/org/alfresco/repo/web/scripts/content/StreamContent.java
View File

@@ -32,7 +32,6 @@ import java.io.Writer;
import java.net.SocketException; import java.net.SocketException;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale; import java.util.Locale;
@@ -89,7 +88,7 @@ public class StreamContent extends AbstractWebScript
protected MimetypeService mimetypeService; protected MimetypeService mimetypeService;
/** Cached file modified date */ /** Cached file modified date */
private Date resouceFileModifiedDate; // private Date resouceFileModifiedDate;
/** /**
* @param mimetypeService * @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 // setup file reader and stream
FileContentReader reader = new FileContentReader(file); FileContentReader reader = new FileContentReader(file);
reader.setMimetype(mimetype); reader.setMimetype(mimetype);
reader.setEncoding("UTF-8"); reader.setEncoding("UTF-8");
streamContentImpl(req, res, reader, attach, this.resouceFileModifiedDate, Date lastModified = new Date(file.lastModified());
String.valueOf(this.resouceFileModifiedDate.getTime()), attachFileName);
streamContentImpl(req, res, reader, attach, lastModified,
String.valueOf(lastModified.getTime()), attachFileName);
} }
/** /**