inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unit test/build - DictionaryModelTypeTest

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6811 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2007-09-18 10:07:43 +00:00
parent bd4bb4f640
commit 9d40827835
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/repo/dictionary/DictionaryDAOImpl.java
View File

@@ -667,11 +667,7 @@ public class DictionaryDAOImpl implements DictionaryDAO
public ModelDefinition getModel(QName name) public ModelDefinition getModel(QName name)
{ {
CompiledModel model = getCompiledModel(name); CompiledModel model = getCompiledModel(name);
if (model != null) return model.getModelDefinition();
{
return model.getModelDefinition();
}
return null;
} }
@@ -948,7 +944,9 @@ public class DictionaryDAOImpl implements DictionaryDAO
CompiledModel compiledModel = model.compile(this, namespaceDAO); CompiledModel compiledModel = model.compile(this, namespaceDAO);
QName modelName = compiledModel.getModelDefinition().getName(); 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) if (previousVersion == null)
{ {
return new ArrayList<M2ModelDiff>(0); return new ArrayList<M2ModelDiff>(0);