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

Fix for ETHREEOH-274 and handling of potentially missing cm:modifiedDate property in DownloadContentServlet.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11254 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2008-10-08 11:22:17 +00:00
parent 7031037e2f
commit 0c66da37c5
2 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java
View File

@@ -243,20 +243,23 @@ public abstract class BaseDownloadContentServlet extends BaseServlet
// check If-Modified-Since header and set Last-Modified header as appropriate
Date modified = (Date)nodeService.getProperty(nodeRef, ContentModel.PROP_MODIFIED);
long modifiedSince = req.getDateHeader("If-Modified-Since");
if (modifiedSince > 0L)
if (modified != null)
{
// round the date to the ignore millisecond value which is not supplied by header
long modDate = (modified.getTime() / 1000L) * 1000L;
if (modDate <= modifiedSince)
long modifiedSince = req.getDateHeader("If-Modified-Since");
if (modifiedSince > 0L)
{
if (logger.isDebugEnabled())
logger.debug("Returning 304 Not Modified.");
res.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
return;
// round the date to the ignore millisecond value which is not supplied by header
long modDate = (modified.getTime() / 1000L) * 1000L;
if (modDate <= modifiedSince)
{
if (logger.isDebugEnabled())
logger.debug("Returning 304 Not Modified.");
res.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
return;
}
}
res.setDateHeader("Last-Modified", modified.getTime());
}
res.setDateHeader("Last-Modified", modified.getTime());
if (attachment == true)
{