[jboss-cvs] JBossAS SVN: r100863 - projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2010-02-11 05:17:50 -0500 (Thu, 11 Feb 2010)
New Revision: 100863

Modified:
   projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
Log:
[JBKERNEL-95] Only unlock/lock the read lock if enable on demand is for the current controller

Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2010-02-11 10:07:37 UTC (rev 100862)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2010-02-11 10:17:50 UTC (rev 100863)
@@ -543,7 +543,8 @@
                if (enableOnDemand && ControllerMode.ON_DEMAND.equals(result.getMode()))
                {
                   //enableOnDemand gets the write lock so unlock the read lock
-                  unlockRead();
+                  if (initiatingController == this)
+                     unlockRead();
                   try
                   {
                      initiatingController.enableOnDemand(result);
@@ -555,7 +556,8 @@
                   }
                   finally
                   {
-                     lockRead(); 
+                     if (initiatingController == this)
+                        lockRead(); 
                   }
                }
                return null;