Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)

121836 jvonka: FileFolder (Node) API - minor tweak
   - code consistency (don't rely on underlying FileFolderService.getType)
   RA-741, RA-635


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126425 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2016-05-10 10:52:30 +00:00
parent 2d1cadafe6
commit 127ca3ff32

View File

@@ -1107,7 +1107,7 @@ public class NodesImpl implements Nodes
// Existing file/folder name handling
final boolean autoRename = Boolean.valueOf(parameters.getParameter(PARAM_AUTO_RENAME));
if (autoRename && (isContent || FileFolderServiceType.FOLDER.equals(fileFolderService.getType(nodeTypeQName))))
if (autoRename && (isContent || isSubClass(nodeTypeQName, ContentModel.TYPE_FOLDER)))
{
NodeRef existingNode = nodeService.getChildByName(parentNodeRef, ContentModel.ASSOC_CONTAINS, nodeName);
if (existingNode != null)