svn commit: r1680093 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java

[st...@apache.org]

Author: struberg
Date: Mon May 18 20:49:51 2015
New Revision: 1680093

URL: http://svn.apache.org/r1680093
Log:
remove unused interceptor List and fix annotation handlign

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java

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=1680093&r1=1680092&r2=1680093&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 Mon May 18 20:49:51 2015
@@ -156,13 +156,6 @@ public class BeanManagerImpl implements
     private Map<Class<?>, AnnotatedType<? extends Annotation>> additionalAnnotatedTypeQualifiers = new HashMap<Class<?>, AnnotatedType<? extends Annotation>>();
 
     /**
-     * This list contains additional interceptor bindings which got set via the
-     * {@link javax.enterprise.inject.spi.BeforeBeanDiscovery#addInterceptorBinding(Class, java.lang.annotation.Annotation...)}
-     * event function.
-     */
-    private List<Class<? extends Annotation>> additionalInterceptorBindings = new ArrayList<Class<? extends Annotation>>();
-
-    /**
      * This list contains additional scopes which got set via the
      * {@link javax.enterprise.inject.spi.BeforeBeanDiscovery#addScope(Class, boolean, boolean)} event function.
      */
@@ -1256,23 +1249,16 @@ public class BeanManagerImpl implements
             additionalQualifiers.add(qualifier);
         }
     }
+
     public void addAdditionalQualifier(AnnotatedType<? extends Annotation> qualifier)
     {
-        if (!additionalQualifiers.contains(qualifier))
+        if (qualifier != null && !additionalQualifiers.contains(qualifier.getJavaClass()))
         {
             additionalAnnotatedTypeQualifiers.put(qualifier.getJavaClass(), qualifier);
             additionalQualifiers.add(qualifier.getJavaClass());
         }
     }
 
-    public void addAdditionalInterceptorBindings(Class<? extends Annotation> interceptorBinding)
-    {
-        if (!additionalInterceptorBindings.contains(interceptorBinding))
-        {
-            additionalInterceptorBindings.add(interceptorBinding);
-        }
-    }
-
     public void addAdditionalAnnotatedType(Object extension, AnnotatedType<?> annotatedType)
     {
         addAdditionalAnnotatedType(extension, annotatedType, extension.toString() + annotatedType + AnnotatedElementFactory.OWB_DEFAULT_KEY);