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

[struberg]

Author: struberg
Date: Wed Jan 16 18:34:21 2013
New Revision: 1434096

URL: http://svn.apache.org/viewvc?rev=1434096&view=rev
Log:
OWB-344 also create separate EJB interceptor instances

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

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java?rev=1434096&r1=1434095&r2=1434096&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
 Wed Jan 16 18:34:21 2013
@@ -158,7 +158,7 @@ public class InjectionTargetImpl<T> exte
             InterceptorDecoratorProxyFactory pf = 
webBeansContext.getInterceptorDecoratorProxyFactory();
 
             Map<Interceptor<?>,Object> interceptorInstances  = new 
HashMap<Interceptor<?>, Object>();
-            for (Interceptor interceptorBean : 
interceptorInfo.getCdiInterceptors())
+            for (Interceptor interceptorBean : 
interceptorInfo.getEjbInterceptors())
             {
                 Object interceptorInstance;
                 if (interceptorBean instanceof SelfInterceptorBean)
@@ -172,6 +172,11 @@ public class InjectionTargetImpl<T> exte
                 interceptorInstances.put(interceptorBean, interceptorInstance);
             }
 
+            for (Interceptor interceptorBean : 
interceptorInfo.getCdiInterceptors())
+            {
+                interceptorInstances.put(interceptorBean, 
interceptorBean.create(creationalContext););
+            }
+
             InterceptorHandler interceptorHandler = new 
DefaultInterceptorHandler<T>(instance, methodInterceptors, 
interceptorInstances);
 
             T proxyInstance = pf.createProxyInstance(proxyClass, instance, 
interceptorHandler);