[weld-commits] Weld SVN: r6063 - core/trunk/impl/src/main/java/org/jboss/weld/util.

[weld-commits at lists.jboss.org]

Author: nickarls
Date: 2010-03-22 09:25:35 -0400 (Mon, 22 Mar 2010)
New Revision: 6063

Modified:
   core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java
Log:
minor NPE guard

Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java	2010-03-22 09:14:26 UTC (rev 6062)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java	2010-03-22 13:25:35 UTC (rev 6063)
@@ -209,7 +209,7 @@
    {
       List<Set<FieldInjectionPoint<?, ?>>> injectableFieldsList = new ArrayList<Set<FieldInjectionPoint<?, ?>>>();
       WeldClass<?> t = type;
-      while (!t.getJavaClass().equals(Object.class))
+      while (t != null && !t.getJavaClass().equals(Object.class))
       {
          Set<FieldInjectionPoint<?, ?>> fields = new HashSet<FieldInjectionPoint<?,?>>();
          injectableFieldsList.add(0, fields);
@@ -392,7 +392,7 @@
          
       });
       WeldClass<?> t = type;
-      while (!t.getJavaClass().equals(Object.class))
+      while (t != null && !t.getJavaClass().equals(Object.class))
       {
          Set<MethodInjectionPoint<?, ?>> initializerMethods = new HashSet<MethodInjectionPoint<?,?>>();
          initializerMethodsList.add(0, initializerMethods);