openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1797855 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: config/BeansDeployer.java container/BeanManagerImpl.java
Date Wed, 07 Jun 2017 06:20:49 GMT
Author: struberg
Date: Wed Jun  7 06:20:49 2017
New Revision: 1797855

URL: http://svn.apache.org/viewvc?rev=1797855&view=rev
Log:
OWB-1186 fix ProcessTypeDiscovery AT Configurator

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.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=1797855&r1=1797854&r2=1797855&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
Wed Jun  7 06:20:49 2017
@@ -741,10 +741,13 @@ public class BeansDeployer
 
         for (AnnotatedTypeConfiguratorHolder holder : event.getAnnotatedTypeConfigurators())
         {
+            AnnotatedType<?> at = holder.getAnnotatedTypeConfigurator().getAnnotated();
             manager.addAdditionalAnnotatedType(
                 holder.getExtension(),
-                holder.getAnnotatedTypeConfigurator().getAnnotated(),
+                at,
                 holder.getId());
+
+            newAt.add(at);
         }
 
 

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=1797855&r1=1797854&r2=1797855&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
Wed Jun  7 06:20:49 2017
@@ -172,7 +172,7 @@ public class BeanManagerImpl implements
     private Set<Class<? extends Annotation>> nonscopeAnnotations = new HashSet<Class<?
extends Annotation>>();
 
 
-    private ConcurrentMap<Class<?>, ConcurrentMap<String, AnnotatedType<?>>>
additionalAnnotatedTypes = new ConcurrentHashMap<Class<?>, ConcurrentMap<String,
AnnotatedType<?>>>();
+    private ConcurrentMap<Class<?>, ConcurrentMap<String, AnnotatedType<?>>>
additionalAnnotatedTypes = new ConcurrentHashMap<>();
 
     private ErrorStack errorStack = new ErrorStack();
 



Mime
View raw message