[jboss-cvs] JBossAS SVN: r100813 - 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-10 12:28:11 -0500 (Wed, 10 Feb 2010)
New Revision: 100813

Modified:
   projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
Log:
[JBKERNEL-92] unlockRead before trying to enableOnDemand

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-10 17:09:20 UTC (rev 100812)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2010-02-10 17:28:11 UTC (rev 100813)
@@ -542,6 +542,8 @@
             {
                if (ControllerMode.ON_DEMAND.equals(result.getMode()))
                {
+                  //enableOnDemand gets the write lock so unlock the read lock
+                  unlockRead();
                   try
                   {
                      initiatingController.enableOnDemand(result);
@@ -551,6 +553,10 @@
                      if (log.isTraceEnabled())
                         log.trace("Unexpected error", ignored);
                   }
+                  finally
+                  {
+                     lockRead(); 
+                  }
                }
                return null;
             }