Merged V2.9 to HEAD

8960: Stop tests running if image transformer not available
   8991: Fix AR-2099
   8993: Fix AR-2099 - fix test fallout


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9031 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-05-08 10:46:36 +00:00
parent 5fe540e1cb
commit 76cea3002b
6 changed files with 205 additions and 204 deletions

View File

@@ -35,7 +35,6 @@ import org.alfresco.service.cmr.dictionary.AssociationDefinition;
import org.alfresco.service.cmr.dictionary.ClassDefinition;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.dictionary.InvalidTypeException;
import org.alfresco.service.cmr.dictionary.ModelDefinition;
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
import org.alfresco.service.cmr.dictionary.TypeDefinition;
@@ -199,12 +198,12 @@ public class DictionaryComponent implements DictionaryService, TenantDeployer
ClassDefinition classDef = getClass(className);
if (classDef == null)
{
throw new InvalidTypeException(className);
return false;
}
ClassDefinition ofClassDef = getClass(ofClassName);
if (ofClassDef == null)
{
throw new InvalidTypeException(ofClassName);
return false;
}
// Only check if both ends are either a type or an aspect