From 9d40827835bbb79e5829d471839c4acfb90642f4 Mon Sep 17 00:00:00 2001
From: Jan Vonka <jan.vonka@alfresco.com>
Date: Tue, 18 Sep 2007 10:07:43 +0000
Subject: [PATCH] Fix unit test/build - DictionaryModelTypeTest

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6811 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/repo/dictionary/DictionaryDAOImpl.java    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/source/java/org/alfresco/repo/dictionary/DictionaryDAOImpl.java b/source/java/org/alfresco/repo/dictionary/DictionaryDAOImpl.java
index def12b2859..a2aff42336 100644
--- a/source/java/org/alfresco/repo/dictionary/DictionaryDAOImpl.java
+++ b/source/java/org/alfresco/repo/dictionary/DictionaryDAOImpl.java
@@ -667,11 +667,7 @@ public class DictionaryDAOImpl implements DictionaryDAO
     public ModelDefinition getModel(QName name)
     {
         CompiledModel model = getCompiledModel(name);
-        if (model != null)
-        {
-            return model.getModelDefinition();
-        }
-        return null;
+        return model.getModelDefinition();
     }
 
 
@@ -948,7 +944,9 @@ public class DictionaryDAOImpl implements DictionaryDAO
         CompiledModel compiledModel = model.compile(this, namespaceDAO);
         QName modelName = compiledModel.getModelDefinition().getName();
         
-        CompiledModel previousVersion = getCompiledModel(modelName);
+        CompiledModel previousVersion = null;
+        try { previousVersion = getCompiledModel(modelName); } catch (DictionaryException e) {} // ignore missing model
+
         if (previousVersion == null)
         {
             return new ArrayList<M2ModelDiff>(0);