You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by rm...@apache.org on 2016/02/10 10:16:54 UTC

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

Author: rmannibucau
Date: Wed Feb 10 09:16:53 2016
New Revision: 1729556

URL: http://svn.apache.org/viewvc?rev=1729556&view=rev
Log:
OWB-1117 dont validate injection points in createInjectionTarget during boot of the container

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=1729556&r1=1729555&r2=1729556&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 Feb 10 09:16:53 2016
@@ -1214,21 +1214,24 @@ public class BeanManagerImpl implements
                         webBeansContext,
                         interceptorUtil.getLifecycleMethods(type, PostConstruct.class),
                         interceptorUtil.getLifecycleMethods(type, PreDestroy.class));
-        try
+        if (afterBeanDiscoveryFired)
         {
-            webBeansContext.getWebBeansUtil().validate(injectionTarget.getInjectionPoints(), null);
-        }
-        catch (final InjectionException ie)
-        {
-            throw new IllegalArgumentException(ie);
-        }
-        catch (final WebBeansConfigurationException ie)
-        {
-            throw new IllegalArgumentException(ie);
-        }
-        catch (final DeploymentException ie)
-        {
-            throw new IllegalArgumentException(ie);
+            try
+            {
+                webBeansContext.getWebBeansUtil().validate(injectionTarget.getInjectionPoints(), null);
+            }
+            catch (final InjectionException ie)
+            {
+                throw new IllegalArgumentException(ie);
+            }
+            catch (final WebBeansConfigurationException ie)
+            {
+                throw new IllegalArgumentException(ie);
+            }
+            catch (final DeploymentException ie)
+            {
+                throw new IllegalArgumentException(ie);
+            }
         }
         GProcessInjectionTarget event = webBeansContext.getWebBeansUtil().fireProcessInjectionTargetEvent(injectionTarget, type);
         final InjectionTarget it = event.getInjectionTarget();
@@ -1236,6 +1239,7 @@ public class BeanManagerImpl implements
         return it;
     }
 
+
     @Override
     public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(T event, Annotation... qualifiers)
     {