Merged HEAD (5.1) to 5.1.N (5.1.1)

112631 gjames: Better Null handling, ACE-4246


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@112682 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-09-23 10:56:22 +00:00
parent 561fbcf4a0
commit 9f209f804b
6 changed files with 103 additions and 14 deletions

View File

@@ -191,9 +191,12 @@ public abstract class ParameterizedItemDefinitionImpl implements ParameterizedIt
List<ParameterDefinition> localizedDefinitions = this.parameterDefinitions.get(locale);
for (ParameterDefinition definition : localizedDefinitions)
if (localizedDefinitions!= null && localizedDefinitions.size()>0)
{
namedDefinitions.put(definition.getName(), definition);
for (ParameterDefinition definition : localizedDefinitions)
{
namedDefinitions.put(definition.getName(), definition);
}
}
}
}