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

[struberg]

Author: struberg
Date: Wed Jul 27 22:04:13 2011
New Revision: 1151645

URL: http://svn.apache.org/viewvc?rev=1151645&view=rev
Log:
OWB-598 fix NPE in InjectionResolver

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java?rev=1151645&r1=1151644&r2=1151645&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
 Wed Jul 27 22:04:13 2011
@@ -237,7 +237,12 @@ public class InjectionResolver
             qualifiers[0] = new AnyLiteral();
         }
 
-        Set<Bean<?>> beanSet = implResolveByType(type, 
injectionPoint.getBean().getBeanClass(), qualifiers);
+        Class injectionPointClass = null;
+        if (injectionPoint.getBean() != null)
+        {
+            injectionPointClass = injectionPoint.getBean().getBeanClass();
+        }
+        Set<Bean<?>> beanSet = implResolveByType(type, injectionPointClass, 
qualifiers);
 
         if (beanSet.isEmpty())
         {
@@ -718,4 +723,4 @@ public class InjectionResolver
 
         return result;
     }
-}
\ No newline at end of file
+}