[jboss-cvs] JBossAS SVN: r106844 - trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers.

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

Author: marius.bogoevici
Date: 2010-07-19 14:08:54 -0400 (Mon, 19 Jul 2010)
New Revision: 106844

Modified:
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
Log:
fix CDI injection into servlet artifacts

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2010-07-19 17:52:19 UTC (rev 106843)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2010-07-19 18:08:54 UTC (rev 106844)
@@ -49,6 +49,7 @@
 import org.apache.catalina.core.StandardContext;
 import org.apache.tomcat.util.modeler.Registry;
 import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerState;
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
@@ -205,7 +206,7 @@
          ControllerContext injectorControllerContext = null;
          while (inspectedUnit != null && injectorControllerContext == null)
          {
-            injectorControllerContext = kernel.getController().getInstalledContext(inspectedUnit.getName() + "_WBInjector");
+            injectorControllerContext = kernel.getController().getContext(inspectedUnit.getName() + "_WBInjector", ControllerState.INSTANTIATED);
             inspectedUnit = inspectedUnit.getParent();
          }
          if (injectorControllerContext != null)