Merged HEAD (5.2) to 5.2.N (5.2.1)

126582 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124741 jkaabimofrad: RA-895: fixed the error message when the relativePath does not exist.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126927 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 12:12:21 +00:00
parent 95affed365
commit ac7d35a8a8

View File

@@ -669,7 +669,6 @@ public class NodesImpl implements Nodes
*/
}
FileInfo fileInfo = null;
try
{
@@ -682,14 +681,14 @@ public class NodesImpl implements Nodes
fileInfo = fileFolderService.getFileInfo(parentNodeRef);
if (fileInfo == null)
{
throw new FileNotFoundException(parentNodeRef);
throw new EntityNotFoundException(parentNodeRef.getId());
}
}
}
catch (FileNotFoundException fnfe)
{
// convert checked exception
throw new EntityNotFoundException(parentNodeRef.getId());
throw new NotFoundException("The entity with relativePath: " + path + " was not found.");
}
return fileInfo.getNodeRef();