WELD-766, WELD-761

* Improve NPE -> ISE * Add validation to createInjectionTarget() to give upfront errors
weld · Nov 25, 2010 · eb0f202 · eb0f202
1 parent 77915c8
commit eb0f202
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java b/impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java
@@ -716,6 +716,14 @@ public Object getReference(Bean<?> bean, Type beanType, CreationalContext<?> cre
     */
    public Object getReference(InjectionPoint injectionPoint, Bean<?> resolvedBean, CreationalContext<?> creationalContext)
    {
+      if (resolvedBean == null)
+      {
+         throw new IllegalArgumentException(NULL_BEAN_ARGUMENT);
+      }
+      if (creationalContext == null)
+      {
+         throw new IllegalArgumentException(NULL_CREATIONAL_CONTEXT_ARGUMENT);
+      }
       boolean registerInjectionPoint = (injectionPoint != null && !injectionPoint.getType().equals(InjectionPoint.class));
       boolean delegateInjectionPoint = injectionPoint != null && injectionPoint.isDelegate();
       try

diff --git a/impl/src/main/java/org/jboss/weld/manager/SimpleInjectionTarget.java b/impl/src/main/java/org/jboss/weld/manager/SimpleInjectionTarget.java
@@ -28,6 +28,7 @@
 import javax.enterprise.inject.spi.InjectionPoint;
 import javax.enterprise.inject.spi.InjectionTarget;
 
+import org.jboss.weld.bootstrap.Validator;
 import org.jboss.weld.exceptions.DefinitionException;
 import org.jboss.weld.exceptions.IllegalStateException;
 import org.jboss.weld.exceptions.WeldException;
@@ -95,6 +96,11 @@ public SimpleInjectionTarget(WeldClass<T> type, BeanManagerImpl beanManager)
             throw new DefinitionException(INJECTION_ON_NON_CONTEXTUAL, type, ip);
          }
       }
+      Validator validator = new Validator();
+      for (InjectionPoint ij : this.injectionPoints)
+      {
+         validator.validateInjectionPoint(ij, beanManager);
+      }
    }
 
    public T produce(CreationalContext<T> ctx)