Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD

34666: Merged BRANCHES/V4.0 to BRANCHES/DEV/V4.0-BUG-FIX
      34664: Fix for ALF-13310 - Hidden renditions cause doclist error
      34665: Second part of fix for ALF-13310 (javascript api)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2012-03-22 14:58:30 +00:00
parent 84cfba1371
commit 728d0a5458
2 changed files with 14 additions and 4 deletions

View File

@@ -21,6 +21,7 @@ package org.alfresco.repo.webdav;
import java.util.List;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.model.filefolder.FileFolderServiceImpl.InvalidTypeException;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileInfo;
@@ -105,6 +106,10 @@ public class WebDavServiceImpl implements WebDavService
url = path.toString();
}
}
catch (InvalidTypeException typeErr)
{
// cannot build path if file is a type such as a rendition
}
catch (FileNotFoundException nodeErr)
{
// cannot build path if file no longer exists, return default