[jboss-cvs] JBossAS SVN: r92732 - projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/injection.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2009-08-24 05:18:23 -0400 (Mon, 24 Aug 2009)
New Revision: 92732

Modified:
   projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/injection/NonContextualObjectInjectionHelper.java
Log:
Add null check.

Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/injection/NonContextualObjectInjectionHelper.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/injection/NonContextualObjectInjectionHelper.java	2009-08-24 09:13:49 UTC (rev 92731)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/injection/NonContextualObjectInjectionHelper.java	2009-08-24 09:18:23 UTC (rev 92732)
@@ -12,10 +12,13 @@
 public class NonContextualObjectInjectionHelper
 {
    @SuppressWarnings("unchecked")
-   public static void injectNonContextualInstance(Object instance, BeanManager webBeansManager)
+   public static void injectNonContextualInstance(Object instance, BeanManager beanManager)
    {
-      CreationalContext<Object> creationalContext =  webBeansManager.createCreationalContext(null);
-      InjectionTarget<Object> injectionTarget = (InjectionTarget<Object>) webBeansManager.createInjectionTarget(webBeansManager.createAnnotatedType(instance.getClass()));
+      if (beanManager == null)
+         throw new IllegalArgumentException("Null bean manager.");
+
+      CreationalContext<Object> creationalContext =  beanManager.createCreationalContext(null);
+      InjectionTarget<Object> injectionTarget = (InjectionTarget<Object>) beanManager.createInjectionTarget(beanManager.createAnnotatedType(instance.getClass()));
       injectionTarget.inject(instance, creationalContext);
    }
 }