Merge from SEAMIST3

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10731 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2008-09-04 11:09:45 +00:00
parent ae909e7413
commit a1bcf7419c
88 changed files with 2794 additions and 729 deletions

View File

@@ -540,7 +540,8 @@ public class DictionaryDAOImpl implements DictionaryDAO
else
{
// immediate sub types only
if (allTypesAndParents.get(type).equals(superType))
QName typesSuperType = allTypesAndParents.get(type);
if (typesSuperType != null && typesSuperType.equals(superType))
{
subTypes.add(type);
}