[jboss-cvs] JBossAS SVN: r76635 - projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins.

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

Author: alesj
Date: 2008-08-05 03:15:38 -0400 (Tue, 05 Aug 2008)
New Revision: 76635

Modified:
   projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
   projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/ScopedController.java
Log:
Scope execution.

Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java	2008-08-05 05:30:58 UTC (rev 76634)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java	2008-08-05 07:15:38 UTC (rev 76635)
@@ -133,6 +133,16 @@
    public Executor getExecutor()
    {
       // TODO - security
+      return getExecutionEnvironment();
+   }
+
+   /**
+    * Get the executor internal w/o security check.
+    *
+    * @return the executor
+    */
+   protected Executor getExecutionEnvironment()
+   {
       return executor;
    }
 

Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/ScopedController.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/ScopedController.java	2008-08-05 05:30:58 UTC (rev 76634)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/ScopedController.java	2008-08-05 07:15:38 UTC (rev 76635)
@@ -21,6 +21,8 @@
 */
 package org.jboss.dependency.plugins;
 
+import java.util.concurrent.Executor;
+
 import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.dependency.spi.ControllerState;
 import org.jboss.dependency.spi.ScopeInfo;
@@ -42,6 +44,14 @@
    private ScopeKey scopeKey;
    private AbstractController underlyingController;
 
+   protected Executor getExecutionEnvironment()
+   {
+      Executor executor = super.getExecutionEnvironment();
+      if (executor == null)
+         executor = getParentController().getExecutionEnvironment();
+      return executor;
+   }
+
    /**
     * Get scope key.
     *