[jboss-cvs] JBossAS SVN: r97327 - in projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration: injection and 1 other directory.

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

Author: pete.muir at jboss.org
Date: 2009-12-02 17:02:38 -0500 (Wed, 02 Dec 2009)
New Revision: 97327

Modified:
   projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldBootstrapDeployer.java
   projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/injection/WeldInjector.java
Log:
Workaround JBoss AS not cleaning up the injector

Modified: projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldBootstrapDeployer.java
===================================================================
--- projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldBootstrapDeployer.java	2009-12-02 22:02:30 UTC (rev 97326)
+++ projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldBootstrapDeployer.java	2009-12-02 22:02:38 UTC (rev 97327)
@@ -50,6 +50,7 @@
       addInput(DeployersUtils.JAVAX_VALIDATION_VALIDATOR_FACTORY);
    }
 
+   @Override
    protected void deployInternal(DeploymentUnit unit, BootstrapInfo info) throws DeploymentException
    {
       ValueMetaData ejbServicesValue = info.getEjbServices();
@@ -90,6 +91,7 @@
       String injectorName = unit.getName() + "_WBInjector";
       BeanMetaDataBuilder weldInjector = BeanMetaDataBuilder.createBuilder(injectorName, WeldInjector.class.getName());
       weldInjector.addConstructorParameter(BootstrapBean.class.getName(), bootstrap.createInject(bootstrapName));
+      weldInjector.setDestroy("cleanup");
       unit.addAttachment(injectorName + "_" + BeanMetaData.class.getSimpleName(), weldInjector.getBeanMetaData());
    }
 

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-12-02 22:02:30 UTC (rev 97326)
+++ projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/injection/WeldInjector.java	2009-12-02 22:02:38 UTC (rev 97327)
@@ -38,4 +38,9 @@
       BeanDeploymentArchive beanDeploymentArchive = bootstrapBean.getDeployment().getFlatBeanDeploymentArchive();
       NonContextualObjectInjectionHelper.injectNonContextualInstance(instance, bootstrapBean.getBootstrap().getManager(beanDeploymentArchive));
    }
+   
+   public void cleanup()
+   {
+      bootstrapBean = null;
+   }
 }