openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r940335 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: config/ config/inheritance/ container/ event/ inject/ intercept/ portable/events/discovery/ proxy/ util/
Date Sun, 02 May 2010 23:31:38 GMT
Author: gerdogdu
Date: Sun May  2 23:31:37 2010
New Revision: 940335

URL: http://svn.apache.org/viewvc?rev=940335&view=rev
Log:
Corrections. Found while running TCK.

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansAnnotatedTypeUtil.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/config/BeansDeployer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=940335&r1=940334&r2=940335&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
Sun May  2 23:31:37 2010
@@ -57,6 +57,7 @@ import org.apache.webbeans.deployment.St
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.exception.WebBeansDeploymentException;
 import org.apache.webbeans.exception.inject.InconsistentSpecializationException;
+import org.apache.webbeans.inject.OWBInjector;
 import org.apache.webbeans.intercept.InterceptorsManager;
 import org.apache.webbeans.intercept.webbeans.WebBeansInterceptor;
 import org.apache.webbeans.logger.WebBeansLogger;
@@ -744,6 +745,9 @@ public class BeansDeployer
                 //Adding injection target
                 manager.putInjectionTargetWrapperForJavaEeComponents(clazz, new InjectionTargetWrapper<T>(processInjectionTargetEvent.getInjectionTarget()));
               
             }
+            
+            //Checks that not contains @Inject InjectionPoint
+            OWBInjector.checkInjectionPointForInjectInjectionPoint(clazz);
         }
         
         //Check for whether this class is candidate for Managed Bean

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java?rev=940335&r1=940334&r2=940335&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java
Sun May  2 23:31:37 2010
@@ -39,7 +39,7 @@ public class BeanInheritedMetaData<T> ex
     
     protected void setInheritedQualifiers()
     {
-        if(this.inheritedClazz != Object.class)
+        if(this.inheritedClazz != null && this.inheritedClazz != Object.class)
         {
             setInheritedTypes(getInheritedQualifiers(), this.inheritedClazz, Qualifier.class);
         }        
@@ -47,7 +47,7 @@ public class BeanInheritedMetaData<T> ex
     
     protected void setInheritedInterceptorBindings()
     {
-        if(this.inheritedClazz != Object.class)
+        if(this.inheritedClazz != null && this.inheritedClazz != Object.class)
         {
             setInheritedTypes(getInheritedInterceptorBindings(), this.inheritedClazz, InterceptorBinding.class);
         }        
@@ -57,7 +57,7 @@ public class BeanInheritedMetaData<T> ex
     
     protected void setInheritedScopeType()
     {
-        if(this.inheritedClazz != Object.class)
+        if(this.inheritedClazz != null && this.inheritedClazz != Object.class)
         {
             setInheritedType(this.inheritedClazz, NormalScope.class);
             setInheritedType(this.inheritedClazz, Scope.class);
@@ -68,7 +68,7 @@ public class BeanInheritedMetaData<T> ex
     
     protected void setInheritedStereoTypes()
     {
-        if(this.inheritedClazz != Object.class)
+        if(this.inheritedClazz != null && this.inheritedClazz != Object.class)
         {
             setInheritedTypes(getInheritedStereoTypes(), this.inheritedClazz, Stereotype.class);
         }        
@@ -77,9 +77,14 @@ public class BeanInheritedMetaData<T> ex
     
     private void setInheritedType(Class<?> inheritedClass, Class<? extends Annotation>
annotationType)
     {
-        Annotation[] inheritedAnnotations = AnnotationUtil.getMetaAnnotations(inheritedClass.getDeclaredAnnotations(),
annotationType);
+        Annotation[] inheritedAnnotations = null;
         
-        if(inheritedAnnotations.length > 0)
+        if(inheritedClass != null)
+        {
+           inheritedAnnotations =  AnnotationUtil.getMetaAnnotations(inheritedClass.getDeclaredAnnotations(),
annotationType);
+        }
+        
+        if(inheritedAnnotations != null && inheritedAnnotations.length > 0)
         {
             if(inheritedAnnotations[0].annotationType().isAnnotationPresent(Inherited.class))
             {
@@ -103,17 +108,25 @@ public class BeanInheritedMetaData<T> ex
     
     private void setInheritedTypes(Set<Annotation> types, Class<?> inheritedClass,
Class<? extends Annotation> annotationType)
     {
-        Annotation[] annotations = AnnotationUtil.getMetaAnnotations(inheritedClass.getDeclaredAnnotations(),
annotationType);
+        Annotation[] annotations = null;
         
-        for(Annotation annotation : annotations)
+        if(inheritedClass != null)
         {
-            if(!types.contains(annotation))
+            annotations = AnnotationUtil.getMetaAnnotations(inheritedClass.getDeclaredAnnotations(),
annotationType);
+        }
+        
+        if(annotations != null)
+        {
+            for(Annotation annotation : annotations)
             {
-                if(AnnotationUtil.hasClassAnnotation(annotation.annotationType(), Inherited.class))
+                if(!types.contains(annotation))
                 {
-                    types.add(annotation);   
+                    if(AnnotationUtil.hasClassAnnotation(annotation.annotationType(), Inherited.class))
+                    {
+                        types.add(annotation);   
+                    }
                 }
-            }
+            }            
         }
         
         if(hasSuperType(inheritedClass))

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=940335&r1=940334&r2=940335&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
Sun May  2 23:31:37 2010
@@ -804,10 +804,7 @@ public class BeanManagerImpl implements 
             creationalContext = CreationalContextFactory.getInstance().wrappedCreationalContext(creationalContext,
bean);
         }        
         
-        
-        //Get bean context
-        context = getContext(bean.getScope());
-        
+                
         //Scope is normal
         if (WebBeansUtil.isScopeTypeNormal(bean.getScope()))
         {
@@ -830,6 +827,10 @@ public class BeanManagerImpl implements 
         //Create Pseudo-Scope Bean Instance
         else
         {
+            //Get bean context
+            context = getContext(bean.getScope());
+            
+            //Get instance for ejb or jms
             instance = getEjbOrJmsProxyReference(bean, beanType, creationalContext);
             
             if(instance != null)

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java?rev=940335&r1=940334&r2=940335&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
Sun May  2 23:31:37 2010
@@ -220,13 +220,12 @@ public final class NotificationManager
                     //ProcessProducer, ProcessProducerMethod, ProcessProducerField,ProcessObserverMEthod
                     else if(WebBeansUtil.isExtensionProducerOrObserverEventType(eventType))
                     {
-                        if(WebBeansUtil.isDefaultExtensionProducerOrObserverEventType(observerClass))
-                        {
+                        GenericProducerObserverEvent genericBeanEvent = (GenericProducerObserverEvent)event;
+                        beanClass = genericBeanEvent.getBeanClass();
+                        Class<?> producerOrObserverReturnClass = genericBeanEvent.getProducerOrObserverType();
 
-                            GenericProducerObserverEvent genericBeanEvent = (GenericProducerObserverEvent)event;
-                            beanClass = genericBeanEvent.getBeanClass();
-                            Class<?> producerOrObserverReturnClass = genericBeanEvent.getProducerOrObserverType();
-            
+                        if(WebBeansUtil.isDefaultExtensionProducerOrObserverEventType(observerClass))
+                        {            
                             if(ClassUtil.isParametrizedType(type))
                             {
                                 boolean isObserverMethod = false;
@@ -242,6 +241,17 @@ public final class NotificationManager
                                 addToMatching(type, matching);
                             }
                         }
+                        else if(observerClass.isAssignableFrom(eventType))
+                        {
+                            if(ClassUtil.isParametrizedType(type))
+                            {
+                                addToMathingWithParametrizedForBeans(type,beanClass,matching);
+                            }
+                            else
+                            {
+                                addToMatching(type, matching);
+                            }                            
+                        }
                     }
                     //BeforeBeanDiscovery,AfterBeanDiscovery,AfterDeploymentValidation
                     //BeforeShutDown Events

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java?rev=940335&r1=940334&r2=940335&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java
Sun May  2 23:31:37 2010
@@ -19,11 +19,13 @@
 package org.apache.webbeans.inject;
 
 import java.io.Serializable;
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.Set;
 
 import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.Default;
 import javax.enterprise.inject.spi.AnnotatedType;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.InjectionPoint;
@@ -35,6 +37,8 @@ import org.apache.webbeans.component.Inj
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.container.InjectionResolver;
 import org.apache.webbeans.context.creational.CreationalContextImpl;
+import org.apache.webbeans.exception.WebBeansConfigurationException;
+import org.apache.webbeans.util.AnnotationUtil;
 import org.apache.webbeans.util.Asserts;
 import org.apache.webbeans.util.ClassUtil;
 import org.apache.webbeans.util.SecurityUtil;
@@ -171,6 +175,25 @@ public final class OWBInjector implement
         return null;
     }
     
+    public static void checkInjectionPointForInjectInjectionPoint(Class<?> clazz)
+    {
+        Asserts.nullCheckForClass(clazz);
+        Field[] fields = SecurityUtil.doPrivilegedGetDeclaredFields(clazz);
+        for(Field field : fields)
+        {
+            if(field.getAnnotation(Inject.class) != null)
+            {
+                if(field.getType() == InjectionPoint.class)
+                {
+                    Annotation[] anns = AnnotationUtil.getQualifierAnnotations(field.getDeclaredAnnotations());
+                    if (AnnotationUtil.hasAnnotation(anns, Default.class))
+                    {
+                        throw new WebBeansConfigurationException("Java EE Component class
:  " + clazz + " can not inject InjectionPoint");
+                    }                            
+                }                
+            }
+        }        
+    }
     
     public static boolean checkInjectionPointForInterceptorPassivation(Class<?> clazz)
     {

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java?rev=940335&r1=940334&r2=940335&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
Sun May  2 23:31:37 2010
@@ -21,6 +21,7 @@ package org.apache.webbeans.intercept;
 import java.lang.reflect.Method;
 import java.util.List;
 
+import javax.enterprise.context.ContextNotActiveException;
 import javax.enterprise.context.spi.Context;
 import javax.enterprise.context.spi.Contextual;
 import javax.enterprise.context.spi.CreationalContext;
@@ -57,11 +58,17 @@ public class NormalScopedBeanInterceptor
     
     private void initiateBeanBag(OwbBean<Object> bean, CreationalContext<Object>
creationalContext)
     {
-        Context webbeansContext = getBeanManager().getContext(bean.getScope());
-        if (webbeansContext instanceof AbstractContext)
+        try
         {
-            AbstractContext owbContext = (AbstractContext)webbeansContext;
-            owbContext.initContextualBag(bean, creationalContext);
+            Context webbeansContext = getBeanManager().getContext(bean.getScope());
+            if (webbeansContext instanceof AbstractContext)
+            {
+                AbstractContext owbContext = (AbstractContext)webbeansContext;
+                owbContext.initContextualBag(bean, creationalContext);
+            }            
+        }catch(ContextNotActiveException e)
+        {
+            //Nothing
         }
     }
     

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java?rev=940335&r1=940334&r2=940335&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
Sun May  2 23:31:37 2010
@@ -79,7 +79,7 @@ public class AfterBeanDiscoveryImpl impl
             ManagedBean managedBean = WebBeansUtil.defineManagedBeanWithoutFireEvents(annotatedType);
             
             this.beanManager.addDecorator(new WebBeansDecorator(managedBean, (Decorator)bean));
-            BeanManagerImpl.getManager().addCustomInterceptorClass(bean.getBeanClass());
           
+            BeanManagerImpl.getManager().addCustomDecoratorClass(bean.getBeanClass());  
         
         }
         else
         {

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java?rev=940335&r1=940334&r2=940335&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
Sun May  2 23:31:37 2010
@@ -36,7 +36,6 @@ import org.apache.webbeans.component.Owb
 import org.apache.webbeans.component.InjectionTargetBean;
 import org.apache.webbeans.context.creational.CreationalContextImpl;
 import org.apache.webbeans.decorator.WebBeansDecorator;
-import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.intercept.ApplicationScopedBeanIntereptorHandler;
 import org.apache.webbeans.intercept.DependentScopedBeanInterceptorHandler;
 import org.apache.webbeans.intercept.InterceptorData;
@@ -44,6 +43,7 @@ import org.apache.webbeans.intercept.Nor
 import org.apache.webbeans.intercept.webbeans.WebBeansInterceptor;
 import org.apache.webbeans.util.ClassUtil;
 import org.apache.webbeans.util.SecurityUtil;
+import org.apache.webbeans.util.WebBeansUtil;
 
 public final class JavassistProxyFactory
 {
@@ -123,7 +123,7 @@ public final class JavassistProxyFactory
         }
         catch (Exception e)
         {
-            throw new WebBeansException(e);
+            WebBeansUtil.throwRuntimeExceptions(e);
         }
 
         return result;
@@ -209,7 +209,7 @@ public final class JavassistProxyFactory
         }
         catch (Exception e)
         {
-            throw new WebBeansException(e);
+            WebBeansUtil.throwRuntimeExceptions(e);
         }
 
         return result;
@@ -298,7 +298,7 @@ public final class JavassistProxyFactory
         }
         catch (Exception e)
         {
-            throw new WebBeansException(e);
+            WebBeansUtil.throwRuntimeExceptions(e);
         }
 
         return result;

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java?rev=940335&r1=940334&r2=940335&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
Sun May  2 23:31:37 2010
@@ -319,17 +319,28 @@ public final class AnnotationUtil
     {
         Asserts.assertNotNull(annotatedMethod, "annotatedMethod argument can not be null");
         Asserts.nullCheckForClass(clazz);
-
+        
+        List<Annotation> list = new ArrayList<Annotation>();
         List<AnnotatedParameter<X>> parameters = annotatedMethod.getParameters();
         for(AnnotatedParameter<X> parameter : parameters)
         {
             if(parameter.isAnnotationPresent(clazz))
             {
-                return getAnnotationsFromSet(parameter.getAnnotations());
+                Annotation[] anns = getAnnotationsFromSet(parameter.getAnnotations());
+                for(Annotation ann : anns)
+                {
+                    if(isQualifierAnnotation(ann.annotationType()))
+                    {
+                        list.add(ann);
+                    }
+                }
             }
         }
         
-        return null;
+        Annotation[] finalAnns = new Annotation[list.size()];
+        finalAnns = list.toArray(finalAnns);
+        
+        return finalAnns;
     }
     
 

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansAnnotatedTypeUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansAnnotatedTypeUtil.java?rev=940335&r1=940334&r2=940335&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansAnnotatedTypeUtil.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansAnnotatedTypeUtil.java
Sun May  2 23:31:37 2010
@@ -36,6 +36,7 @@ import javax.decorator.Delegate;
 import javax.enterprise.context.Dependent;
 import javax.enterprise.event.Observes;
 import javax.enterprise.event.Reception;
+import javax.enterprise.inject.Default;
 import javax.enterprise.inject.Disposes;
 import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.Specializes;
@@ -899,4 +900,62 @@ public final class WebBeansAnnotatedType
 
     }    
     
+    @SuppressWarnings("unchecked")
+    public static <X> Method getDisposalWithGivenAnnotatedMethod(AnnotatedType<X>
annotatedType, Type beanType, Annotation[] qualifiers)
+    {
+        Set<AnnotatedMethod<? super X>> annotatedMethods = annotatedType.getMethods();
 
+        
+        if(annotatedMethods != null)
+        {
+            for (AnnotatedMethod<? super X> annotatedMethod : annotatedMethods)
+            {
+                AnnotatedMethod<X> annt = (AnnotatedMethod<X>)annotatedMethod;
+                List<AnnotatedParameter<X>> parameters = annt.getParameters();
+                if(parameters != null)
+                {
+                    boolean found = false;                    
+                    for(AnnotatedParameter<X> parameter : parameters)
+                    {
+                        if(parameter.isAnnotationPresent(Disposes.class))
+                        {
+                            found = true;
+                            break;
+                        }
+                    }
+                    
+                    if(found)
+                    {
+                        Type type = AnnotationUtil.getAnnotatedMethodFirstParameterWithAnnotation(annotatedMethod,
Disposes.class);
+                        Annotation[] annots = AnnotationUtil.getAnnotatedMethodFirstParameterQualifierWithGivenAnnotation(annotatedMethod,
Disposes.class);
+                        
+                        if(type.equals(beanType))
+                        {
+                            for(Annotation qualifier : qualifiers)
+                            {
+                                if(qualifier.annotationType() != Default.class)
+                                {
+                                    for(Annotation ann :annots)
+                                    {
+                                        if(!AnnotationUtil.hasAnnotationMember(qualifier.annotationType(),
qualifier, ann))
+                                        {
+                                            return null;
+                                        }
+                                        else
+                                        {
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                            
+                            return annotatedMethod.getJavaMember();
+                        }                
+                    }                                
+                }
+            }            
+        }        
+        return null;
+        
+    }
+    
 }

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=940335&r1=940334&r2=940335&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
Sun May  2 23:31:37 2010
@@ -2450,7 +2450,7 @@ public final class WebBeansUtil
         for(ProducerMethodBean<?> bean : annotatedMethods.keySet())
         {
             AnnotatedMethod<?> annotatedMethod = annotatedMethods.get(bean);      
         
-            Method disposal = bean.getDisposalMethod();
+            Method disposal = WebBeansAnnotatedTypeUtil.getDisposalWithGivenAnnotatedMethod(annotatedType,
bean.getReturnType(), AnnotationUtil.getAnnotationsFromSet(bean.getQualifiers()));
             
             AnnotatedMethod<?> disposalAnnotated = null;
             GProcessProducerMethod processProducerMethodEvent = null;



Mime
View raw message