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

revert kludge

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@79601 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-08-13 17:06:19 +00:00
parent 3011eeeafe
commit 88e47210dc
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/java/org/alfresco/repo/dictionary/DictionaryModelType.java
View File

@@ -26,7 +26,6 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.CopyOnWriteArraySet;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.ContentServicePolicies; import org.alfresco.repo.content.ContentServicePolicies;
import org.alfresco.repo.lock.JobLockService; import org.alfresco.repo.lock.JobLockService;
@@ -256,20 +255,16 @@ public class DictionaryModelType implements ContentServicePolicies.OnContentUpda
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private void queueModel(NodeRef nodeRef) private void queueModel(NodeRef nodeRef)
{ {
// Temp kludge for ACE-2487 - prevent all dynamic models being loaded. Set<NodeRef> pendingModels = (Set<NodeRef>)AlfrescoTransactionSupport.getResource(KEY_PENDING_MODELS);
// Do not release community or enterprise with this in place. if (pendingModels == null)
throw new AlfrescoRuntimeException("dynamic models not allowed"); {
//pendingModels = Collections.newSetFromMap(new ConcurrentHashMap()); // Java 6
pendingModels = new CopyOnWriteArraySet<NodeRef>();
AlfrescoTransactionSupport.bindResource(KEY_PENDING_MODELS, pendingModels);
}
pendingModels.add(tenantService.getName(nodeRef));
// Set<NodeRef> pendingModels = (Set<NodeRef>)AlfrescoTransactionSupport.getResource(KEY_PENDING_MODELS); AlfrescoTransactionSupport.bindListener(this.transactionListener);
// if (pendingModels == null)
// {
// //pendingModels = Collections.newSetFromMap(new ConcurrentHashMap()); // Java 6
// pendingModels = new CopyOnWriteArraySet<NodeRef>();
// AlfrescoTransactionSupport.bindResource(KEY_PENDING_MODELS, pendingModels);
// }
// pendingModels.add(tenantService.getName(nodeRef));
//
// AlfrescoTransactionSupport.bindListener(this.transactionListener);
} }
/** /**