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

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

source/java/org/alfresco/repo/policy/CachedPolicyFactory.java

@@ -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,42 +92,40 @@ 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)
+            {
+                return policyInterface;
+            }
+        }
+        finally
         {
-                // Upgrade read lock to write lock
             lock.readLock().unlock();
-                lock.writeLock().lock();
+        }
         
+        // There wasn't one
+        LockHelper.tryLock(lock.writeLock(), 100);
         try
         {
-                    // Check again
-                    policyInterface = singleCache.get(binding);
-                    if (policyInterface == null)
+            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());
-                    }
-                }
-                finally
-                {
-                    // Downgrade lock to read
-                    lock.readLock().lock();
-                    lock.writeLock().unlock();
-                }
-            }
+            
             return policyInterface;
         }
         finally
         {
-            lock.readLock().unlock();
+            lock.writeLock().unlock();
         }
     }
     
@@ -140,46 +139,43 @@ 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)
+            {
+                return policyInterfaces;
+            }
+        }
+        finally
         {
-                // Upgrade read lock to write lock
             lock.readLock().unlock();
-                lock.writeLock().lock();
+        }
         
+        // There wasn't one
+        LockHelper.tryLock(lock.writeLock(), 100);
         try
         {
-                    // Check again
-                    policyInterfaces = listCache.get(binding);
-                    if (policyInterfaces == null)
+            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());
-                    }
-                }
-                finally
-                {
-                    // Downgrade lock to read
-                    lock.readLock().lock();
-                    lock.writeLock().unlock();
-                }
-            }
+            
             return policyInterfaces;
         }
         finally
         {
-            lock.readLock().unlock();
+            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;
             }
         }
     }
-    
 }

source/java/org/alfresco/repo/policy/ClassBehaviourIndex.java

@@ -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);