more fixes

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@2284 1c488680-804c-0410-94cd-c6b725194a0e
weld · Mar 31, 2009 · 5dd694a · 5dd694a
1 parent 0667506
commit 5dd694a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java b/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java
@@ -101,7 +101,7 @@ public void initialize(BeanDeployerEnvironment environment)
       {
          super.initialize(environment);
          checkProducerMethod();
-         // initDisposalMethod();
+         initDisposalMethod(environment);
          initInjectionPoints();
       }
    }

diff --git a/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java b/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java
@@ -8,6 +8,7 @@
 import javax.event.Observes;
 import javax.inject.BindingType;
 import javax.inject.DeploymentType;
+import javax.inject.Disposes;
 import javax.inject.Initializer;
 import javax.inject.Produces;
 import javax.inject.Realizes;
@@ -126,8 +127,8 @@ public BeanDeployer deploy()
 
    private void checkDisposalMethods() {
 	      Set<DisposalMethodBean<?>> all = new HashSet<DisposalMethodBean<?>>(beanDeployerEnvironment.getAllDisposalBeans()); 
-	      Set<DisposalMethodBean<?>> resolved = new HashSet<DisposalMethodBean<?>>(beanDeployerEnvironment.getResolvedDisposalBeans()); 
-	      if(resolved.containsAll(all)) {
+	      Set<DisposalMethodBean<?>> resolved = new HashSet<DisposalMethodBean<?>>(beanDeployerEnvironment.getResolvedDisposalBeans());
+	      if(all.size()>0 && !resolved.containsAll(all)) {
 	         StringBuffer buff = new StringBuffer();
 	         buff.append("The following Disposal methods where not resolved\n");
 	         all.removeAll(resolved);
@@ -182,7 +183,13 @@ private void createProducerMethods(AbstractClassBean<?> declaringBean, Annotated
 
    private void createDisposalMethods(AbstractClassBean<?> declaringBean, AnnotatedClass<?> annotatedClass)
    {
-
+      for (AnnotatedMethod<?> method : annotatedClass.getDeclaredMethodsWithAnnotatedParameters(Disposes.class))
+      {
+         DisposalMethodBean<?> disposalBean = DisposalMethodBean.of(manager, method, declaringBean);
+         beanDeployerEnvironment.addAllDisposalBean(disposalBean);
+         manager.getResolver().addInjectionPoints(disposalBean.getInjectionPoints());
+         manager.addBean(disposalBean);
+      }
    }
 
    private <T> void createProducerMethod(AbstractClassBean<?> declaringBean, AnnotatedMethod<T> annotatedMethod)