svn commit: r1435051 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: portable/ProducerMethodProducer.java util/WebBeansUtil.java

[ar...@apache.org]

Author: arne
Date: Fri Jan 18 08:32:24 2013
New Revision: 1435051

URL: http://svn.apache.org/viewvc?rev=1435051&view=rev
Log:
OWB-755: Fixed disposal

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java?rev=1435051&r1=1435050&r2=1435051&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java Fri Jan 18 08:32:24 2013
@@ -27,7 +27,6 @@ import javax.enterprise.context.spi.Crea
 import javax.enterprise.inject.spi.AnnotatedMethod;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
 
 import org.apache.webbeans.component.OwbBean;
 import org.apache.webbeans.config.WebBeansContext;
@@ -35,6 +34,9 @@ import org.apache.webbeans.context.creat
 import org.apache.webbeans.inject.InjectableMethod;
 import org.apache.webbeans.util.Asserts;
 
+/**
+ * A {@link javax.enterprise.inject.spi.Producer} for producer-method beans.
+ */
 public class ProducerMethodProducer<T, P> extends AbstractProducer<T> {
 
     private Bean<P> owner;

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1435051&r1=1435050&r2=1435051&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Fri Jan 18 08:32:24 2013
@@ -108,6 +108,7 @@ import org.apache.webbeans.component.cre
 import org.apache.webbeans.component.creation.ManagedBeanBuilder;
 import org.apache.webbeans.component.creation.NewEjbBeanBuilder;
 import org.apache.webbeans.component.creation.NewManagedBeanBuilder;
+import org.apache.webbeans.component.creation.ProducerMethodProducerBuilder;
 import org.apache.webbeans.config.EJBWebBeansConfigurator;
 import org.apache.webbeans.config.OWBLogConst;
 import org.apache.webbeans.config.OpenWebBeansConfiguration;
@@ -1883,7 +1884,8 @@ public final class WebBeansUtil
 
     public GProcessProducer fireProcessProducerEventForMethod(ProducerMethodBean<?> producerMethod, AnnotatedMethod<?> method)
     {
-        GProcessProducer producerEvent = new GProcessProducer(new ProducerMethodProducer(producerMethod.getParent(), method, null, producerMethod.getInjectionPoints()),method);
+        ProducerMethodProducerBuilder builder = new ProducerMethodProducerBuilder(producerMethod);
+        GProcessProducer producerEvent = new GProcessProducer(builder.build(method), method);
 
         //Fires ProcessProducer for methods
         webBeansContext.getBeanManagerImpl().fireEvent(producerEvent, AnnotationUtil.EMPTY_ANNOTATION_ARRAY);