svn commit: r1561525 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java

[arne]

Author: arne
Date: Sun Jan 26 18:20:05 2014
New Revision: 1561525

URL: http://svn.apache.org/r1561525
Log:
OWB-897: Added null check at proxy creation

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java?rev=1561525&r1=1561524&r2=1561525&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java
 Sun Jan 26 18:20:05 2014
@@ -181,7 +181,7 @@ public abstract class AbstractProducer<T
 
         T instance = produce(interceptorInstances, creationalContextImpl);
 
-        if (interceptorInfo != null)
+        if (hasInterceptorInfo())
         {
             // register the bean itself for self-interception
             if (interceptorInfo.getSelfInterceptorBean() != null)
@@ -236,6 +236,11 @@ public abstract class AbstractProducer<T
         return methodInterceptors.size() != 0;
     }
 
+    protected boolean hasInterceptorInfo()
+    {
+        return interceptorInfo != null && proxyClass != null;
+    }
+
     protected boolean isDelegateInjection(final CreationalContextImpl<?> cc)
     {
         final InjectionPoint ip = cc.getInjectionPoint();