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

Merged V4.1-BUG-FIX to HEAD

Browse Source 
42774: ALF-16367: MT fix for "Exporting a tenant from one instance A and importing it to another Alfresco instance B does not work"
   42775: Merged DEV to V4.1-BUG-FIX
      42274: First part of ALF-14341: WQS: SOLR Request failed wit error 500: DTENANT_FILTER_FROM_JSON
             WQS jobs don't execute if repository is in the bootstrapping state.
             RepositoryState class was made thread safe. 
   42781: ALF-15135: Apple Mail always fails when copying folders with nested folders
   - Because FileFolderService.resolveNamePath was not properly honouring mustExist==false for parent folders
   42798: ALF-16384 - checkLicenseForSyncMode exposed via properties files
      code comments changed.
   42799: ALF-16384 - checkLicenseForSyncMode exposed via properties files    properties comments changed.
   42801: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_10_17 to BRANCHES/DEV/V4.1-BUG-FIX:
      42748: ALF-14200: Adding Invalid Aspects Via CMIS ATOM API Results in NullPointerException
   42802: Fix failing NodeServiceTest
   - Moved parentless node validation to correct location to avoid NPEs in indexing
   - Fixed unit test to temporarily disable indexing in order to be able to create a corrupt parentless node


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42803 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-10-18 12:03:53 +00:00
parent 18e20933e5
commit 502bb3d954
6 changed files with 77 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
View File

@@ -1367,9 +1367,14 @@ public class FileFolderServiceImpl implements FileFolderService
NodeRef folderNodeRef = searchSimple(parentNodeRef, pathElement);
if (folderNodeRef == null)
{
StringBuilder sb = new StringBuilder(128);
sb.append("Folder not found: " + currentPath);
throw new FileNotFoundException(sb.toString());
if (mustExist)
{
throw new FileNotFoundException("Folder not found: " + currentPath);
}
else
{
return null;
}
}
parentNodeRef = folderNodeRef;
}