[jboss-cvs] JBossAS SVN: r72482 - in projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata: plugins and 1 other directory.

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

Author: alesj
Date: 2008-04-21 02:45:58 -0400 (Mon, 21 Apr 2008)
New Revision: 72482

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/FromContextDelegate.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
Log:
Remove dependent state modification.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/FromContextDelegate.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/FromContextDelegate.java	2008-04-21 05:12:36 UTC (rev 72481)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/FromContextDelegate.java	2008-04-21 06:45:58 UTC (rev 72482)
@@ -328,7 +328,7 @@
 
       public StateFromContext(String fromString)
       {
-         super(fromString);
+         super(fromString, ControllerState.NOT_INSTALLED);
       }
 
       public ControllerState internalExecute(ControllerContext context)

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java	2008-04-21 05:12:36 UTC (rev 72481)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java	2008-04-21 06:45:58 UTC (rev 72482)
@@ -34,10 +34,8 @@
 import org.jboss.dependency.spi.Controller;
 import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.dependency.spi.ControllerState;
-import org.jboss.dependency.spi.ControllerStateModel;
 import org.jboss.dependency.spi.DependencyItem;
 import org.jboss.kernel.plugins.dependency.ClassContextDependencyItem;
-import org.jboss.kernel.spi.dependency.KernelControllerContext;
 import org.jboss.reflect.spi.TypeInfo;
 import org.jboss.util.JBossStringBuilder;
 
@@ -208,29 +206,10 @@
       // controller context property injection
       if (fromContext != null)
       {
-         // check if whenRequired > dependent when used on itself
-         if (super.getUnderlyingValue() == null)
-         {
-            ControllerState when = whenRequiredState;
-            if (when == null)
-               when = visitor.getContextState();
-
-            KernelControllerContext kcc = visitor.getControllerContext();
-            Controller controller = kcc.getController();
-            ControllerStateModel states = controller.getStates();
-
-            if (dependentState == null)
-            {
+         // check if dependent is not set when used on itself
+         if (super.getUnderlyingValue() == null && dependentState == null)
                dependentState = fromContext.getWhenValid();
-            }
 
-            if (states.isAfterState(dependentState, when) == false)
-            {
-               dependentState = states.getPreviousState(when);
-               if (log.isTraceEnabled())
-                  log.trace("Cannot set demand state to more/equal than when required state, changing it to : " + dependentState);
-            }
-         }
          super.initialVisit(visitor);
          return;
       }