svn commit: r1083103 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java

[struberg]

Author: struberg
Date: Fri Mar 18 23:15:26 2011
New Revision: 1083103

URL: http://svn.apache.org/viewvc?rev=1083103&view=rev
Log:
OWB-503 lazily resolve InterceptorUtil to prevent NPEs

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java?rev=1083103&r1=1083102&r2=1083103&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
 Fri Mar 18 23:15:26 2011
@@ -153,8 +153,6 @@ public abstract class InterceptorHandler
 
     protected WebBeansContext webBeansContext;
 
-    protected InterceptorUtil interceptorUtil;
-
     /**
      * Creates a new handler.
      * @param bean proxied bean
@@ -163,7 +161,6 @@ public abstract class InterceptorHandler
     {
         this.bean = bean;
         this.webBeansContext = bean.getWebBeansContext();
-        this.interceptorUtil = webBeansContext.getInterceptorUtil();
     }
 
     /**
@@ -254,6 +251,7 @@ public abstract class InterceptorHandler
                             }
         
                             // Filter both EJB and WebBeans interceptors
+                            InterceptorUtil interceptorUtil = 
webBeansContext.getInterceptorUtil();
                             
interceptorUtil.filterCommonInterceptorStackList(filteredInterceptorStack, 
method);
                             
interceptorUtil.filterOverridenAroundInvokeInterceptor(bean.getBeanClass(), 
filteredInterceptorStack);
                             this.interceptedMethodMap.put(method, 
filteredInterceptorStack);