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

Merged HEAD-BUG-FIX to HEAD (changes required to support ALF-19785)

Browse Source 
54568: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2.0)
    54471: Fix MNT-9517: Deadlock when binding class behaviours during bootstrap AND starting subsystems
  54471: Fix MNT-9517: Deadlock when binding class behaviours during bootstrap AND starting subsystems


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54747 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2013-09-02 08:42:13 +00:00
parent 6ba121eb00
commit 2066ff0384
2 changed files with 64 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/java/org/alfresco/repo/policy/ClassBehaviourIndex.java
View File

@@ -25,6 +25,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.LockHelper;
/**
@@ -88,13 +89,10 @@ import org.alfresco.service.namespace.QName;
}
/* (non-Javadoc)
* @see org.alfresco.repo.policy.BehaviourIndex#getAll()
*/
@SuppressWarnings("unchecked")
@Override
public Collection<BehaviourDefinition> getAll()
{
lock.readLock().lock();
LockHelper.tryLock(lock.readLock(), 100);
try
{
@@ -110,13 +108,11 @@ import org.alfresco.service.namespace.QName;
}
/* (non-Javadoc)
* @see org.alfresco.repo.policy.BehaviourIndex#find()
*/
@Override
@SuppressWarnings("unchecked")
public Collection<BehaviourDefinition> find(B binding)
{
lock.readLock().lock();
LockHelper.tryLock(lock.readLock(), 100);
try
{
@@ -158,18 +154,14 @@ import org.alfresco.service.namespace.QName;
}
/* (non-Javadoc)
* @see org.alfresco.repo.policy.BehaviourIndex#find()
*/
@Override
public void addChangeObserver(BehaviourChangeObserver<B> observer)
{
observers.add(observer);
}
/* (non-Javadoc)
* @see org.alfresco.repo.policy.BehaviourIndex#getFilter()
*/
@Override
public BehaviourFilter getFilter()
{
return filter;
@@ -183,7 +175,7 @@ import org.alfresco.service.namespace.QName;
*/
public void putClassBehaviour(BehaviourDefinition<B> behaviour)
{
lock.writeLock().lock();
LockHelper.tryLock(lock.writeLock(), 100);
try
{
classMap.put(behaviour);
@@ -202,7 +194,7 @@ import org.alfresco.service.namespace.QName;
*/
public void putServiceBehaviour(BehaviourDefinition<ServiceBehaviourBinding> behaviour)
{
lock.writeLock().lock();
LockHelper.tryLock(lock.writeLock(), 100);
try
{
serviceMap.put(behaviour);
@@ -220,7 +212,7 @@ import org.alfresco.service.namespace.QName;
*/
public void removeClassBehaviour(BehaviourDefinition<B> behaviour)
{
lock.writeLock().lock();
LockHelper.tryLock(lock.writeLock(), 100);
try
{
classMap.remove(behaviour);