Merged V2.2 to HEAD

8231: Fix for AR-2055
   8240: Fix for AR-2055 - missing file
   8253: Add caching to audit queries

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8499 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2008-03-11 10:14:52 +00:00
parent 98d48ec77c
commit f22ba31c7e
9 changed files with 674 additions and 317 deletions

View File

@@ -38,6 +38,7 @@ import org.alfresco.jlan.server.filesys.FileExistsException;
import org.alfresco.jlan.server.filesys.FileName;
import org.alfresco.jlan.util.WildCard;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.model.filefolder.FileFolderServiceImpl;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.repository.ContentData;
@@ -352,7 +353,8 @@ public class CifsHelper
NodeRef parentFolderNodeRef = rootNodeRef;
if (folderPathElements.size() > 0)
{
parentFolderNodeRef = fileFolderService.makeFolders(
parentFolderNodeRef = FileFolderServiceImpl.makeFolders(
fileFolderService,
rootNodeRef,
folderPathElements,
ContentModel.TYPE_FOLDER).getNodeRef();