You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openwebbeans.apache.org by ta...@apache.org on 2016/12/28 14:23:21 UTC

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

Author: tandraschko
Date: Wed Dec 28 14:23:21 2016
New Revision: 1776283

URL: http://svn.apache.org/viewvc?rev=1776283&view=rev
Log:
OWB-1163 NPE in BeforeBeanDiscovery#addAnnotatedType if id is null

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=1776283&r1=1776282&r2=1776283&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 Dec 28 14:23:21 2016
@@ -1302,6 +1302,11 @@ public class BeanManagerImpl implements
             return;
         }
 
+        if (id == null)
+        {
+            id = extension.getClass().getName() + annotatedType + AnnotatedElementFactory.OWB_DEFAULT_KEY;
+        }
+        
         webBeansContext.getAnnotatedElementFactory().setAnnotatedType(annotatedType, id);
         ConcurrentMap<String, AnnotatedType<?>> annotatedTypes = additionalAnnotatedTypes.get(annotatedType.getJavaClass());
         if (annotatedTypes == null)