[jboss-cvs] JBossAS SVN: r95937 - projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/injection.

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

Author: pete.muir at jboss.org
Date: 2009-11-02 19:15:23 -0500 (Mon, 02 Nov 2009)
New Revision: 95937

Modified:
   projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/injection/WeldInjector.java
Log:
No need to call out to ServletServices

Modified: projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/injection/WeldInjector.java
===================================================================
--- projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/injection/WeldInjector.java	2009-11-02 23:56:42 UTC (rev 95936)
+++ projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/injection/WeldInjector.java	2009-11-03 00:15:23 UTC (rev 95937)
@@ -3,7 +3,6 @@
 import org.jboss.ejb3.BeanContext;
 import org.jboss.injection.Injector;
 import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.weld.servlet.api.ServletServices;
 import org.jboss.weld.integration.deployer.env.helpers.BootstrapBean;
 
 /**
@@ -35,10 +34,8 @@
 
    public void inject(Object instance)
    {
-      // assume that the deployment is flat. If this changes, the servlet context
-      // needs to be passed along
-      ServletServices services = bootstrapBean.getDeployment().getServices().get(ServletServices.class);
-      BeanDeploymentArchive beanDeploymentArchive = services.getBeanDeploymentArchive(null);
+      // assume that the deployment is flat
+      BeanDeploymentArchive beanDeploymentArchive = bootstrapBean.getDeployment().getFlatBeanDeploymentArchive();
       NonContextualObjectInjectionHelper.injectNonContextualInstance(instance, bootstrapBean.getBootstrap().getManager(beanDeploymentArchive));
    }
 }