From 75213e84ee20a2f9d2240c8676a9fb136eb2d363 Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Thu, 13 Sep 2007 15:59:51 +0000 Subject: [PATCH] Fix to DictionaryRepositoryBootstrap - ignore working copy of Dictionary Model git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6777 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../DictionaryRepositoryBootstrap.java | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/source/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrap.java b/source/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrap.java index 875334b249..083f36f882 100644 --- a/source/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrap.java +++ b/source/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrap.java @@ -262,17 +262,22 @@ public class DictionaryRepositoryBootstrap extends AbstractLifecycleBean impleme for (NodeRef dictionaryModel : nodeRefs) { - boolean isActive = ((Boolean)nodeService.getProperty(dictionaryModel, ContentModel.PROP_MODEL_ACTIVE)).booleanValue(); - if (isActive) - { - M2Model model = createM2Model(dictionaryModel); - if (model != null) - { - for (M2Namespace namespace : model.getNamespaces()) - { - modelMap.put(namespace.getUri(), model); - } - } + // Ignore if the node is a working copy or if its inactive + if (nodeService.hasAspect(dictionaryModel, ContentModel.ASPECT_WORKING_COPY) == false) + { + Boolean isActive = (Boolean)nodeService.getProperty(dictionaryModel, ContentModel.PROP_MODEL_ACTIVE); + + if ((isActive != null) && (isActive.booleanValue() == true)) + { + M2Model model = createM2Model(dictionaryModel); + if (model != null) + { + for (M2Namespace namespace : model.getNamespaces()) + { + modelMap.put(namespace.getUri(), model); + } + } + } } } }