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

Fixed test failures as a result of r72733 commit.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@72764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2014-06-02 12:16:21 +00:00
parent 5a021b2565
commit 465034f0be
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/service/cmr/model/FileFolderUtil.java
View File

@@ -150,7 +150,7 @@ public class FileFolderUtil
currentParentRef = createdFileInfo.getNodeRef(); currentParentRef = createdFileInfo.getNodeRef();
Map<QName, Map<QName, Serializable>> requireddAspects = pathElement.getAspects(); Map<QName, Map<QName, Serializable>> requireddAspects = pathElement.getAspects();
if (requireddAspects != null && nodeService != null) if (requireddAspects.size() > 0 && nodeService != null)
{ {
for (QName aspect : requireddAspects.keySet()) for (QName aspect : requireddAspects.keySet())
{ {
@@ -232,7 +232,14 @@ public class FileFolderUtil
public PathElementDetails(String folderName, Map<QName, Map<QName, Serializable>> aspects) public PathElementDetails(String folderName, Map<QName, Map<QName, Serializable>> aspects)
{ {
this.folderName = folderName; this.folderName = folderName;
this.aspects = Collections.unmodifiableMap(aspects); if (aspects == null)
{
this.aspects = Collections.emptyMap();
}
else
{
this.aspects = Collections.unmodifiableMap(aspects);
}
} }
/** /**