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

115
source/java/org/alfresco/repo/policy/CachedPolicyFactory.java
View File

@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.alfresco.util.LockHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -91,43 +92,41 @@ import org.apache.commons.logging.LogFactory;
return super.create(binding);
}
lock.readLock().lock();
LockHelper.tryLock(lock.readLock(), 100);
try
{
P policyInterface = singleCache.get(binding);
if (policyInterface == null)
if (policyInterface != null)
{
// Upgrade read lock to write lock
lock.readLock().unlock();
lock.writeLock().lock();
try
{
// Check again
policyInterface = singleCache.get(binding);
if (policyInterface == null)
{
policyInterface = super.create(binding);
singleCache.put(binding, policyInterface);
if (logger.isDebugEnabled())
logger.debug("Cached delegate interface " + policyInterface + " for " + binding + " and policy " + getPolicyClass());
}
}
finally
{
// Downgrade lock to read
lock.readLock().lock();
lock.writeLock().unlock();
}
return policyInterface;
}
return policyInterface;
}
finally
{
lock.readLock().unlock();
}
// There wasn't one
LockHelper.tryLock(lock.writeLock(), 100);
try
{
P policyInterface = singleCache.get(binding);
if (policyInterface != null)
{
return policyInterface;
}
policyInterface = super.create(binding);
singleCache.put(binding, policyInterface);
if (logger.isDebugEnabled())
logger.debug("Cached delegate interface " + policyInterface + " for " + binding + " and policy " + getPolicyClass());
return policyInterface;
}
finally
{
lock.writeLock().unlock();
}
}
@@ -140,45 +139,42 @@ import org.apache.commons.logging.LogFactory;
return super.createList(binding);
}
lock.readLock().lock();
LockHelper.tryLock(lock.readLock(), 100);
try
{
Collection<P> policyInterfaces = listCache.get(binding);
if (policyInterfaces == null)
if (policyInterfaces != null)
{
// Upgrade read lock to write lock
lock.readLock().unlock();
lock.writeLock().lock();
try
{
// Check again
policyInterfaces = listCache.get(binding);
if (policyInterfaces == null)
{
policyInterfaces = super.createList(binding);
listCache.put(binding, policyInterfaces);
if (logger.isDebugEnabled())
logger.debug("Cached delegate interface collection " + policyInterfaces + " for " + binding + " and policy " + getPolicyClass());
}
}
finally
{
// Downgrade lock to read
lock.readLock().lock();
lock.writeLock().unlock();
}
return policyInterfaces;
}
return policyInterfaces;
}
}
finally
{
lock.readLock().unlock();
}
}
// There wasn't one
LockHelper.tryLock(lock.writeLock(), 100);
try
{
Collection<P> policyInterfaces = listCache.get(binding);
if (policyInterfaces != null)
{
return policyInterfaces;
}
policyInterfaces = super.createList(binding);
listCache.put(binding, policyInterfaces);
if (logger.isDebugEnabled())
logger.debug("Cached delegate interface collection " + policyInterfaces + " for " + binding + " and policy " + getPolicyClass());
return policyInterfaces;
}
finally
{
lock.writeLock().unlock();
}
}
/**
* Clear entries in the cache based on binding changes.
@@ -191,8 +187,7 @@ import org.apache.commons.logging.LogFactory;
{
if (binding == null)
{
lock.writeLock().lock();
LockHelper.tryLock(lock.writeLock(), 100);
try
{
// A specific binding has not been provided, so clear all entries
@@ -230,8 +225,7 @@ import org.apache.commons.logging.LogFactory;
// Remove all invalid bindings
if (invalidBindings.size() > 0)
{
lock.writeLock().lock();
LockHelper.tryLock(lock.writeLock(), 100);
try
{
for (B invalidBinding : invalidBindings)
@@ -249,5 +243,4 @@ import org.apache.commons.logging.LogFactory;
}
}
}
}