Author: struberg
Date: Mon Jan 7 23:36:17 2013
New Revision: 1430089
URL: http://svn.apache.org/viewvc?rev=1430089&view=rev
Log:
OWB-344 also remove CustomInterceptor from AfterBeanDiscovery
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java?rev=1430089&r1=1430088&r2=1430089&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
Mon Jan 7 23:36:17 2013
@@ -35,7 +35,6 @@ import org.apache.webbeans.config.WebBea
import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.decorator.WebBeansDecorator;
import org.apache.webbeans.intercept.InterceptorsManager;
-import org.apache.webbeans.intercept.custom.CustomInterceptorBean;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
import org.apache.webbeans.portable.events.generics.GProcessBean;
import org.apache.webbeans.portable.events.generics.GProcessObservableMethod;
@@ -82,7 +81,7 @@ public class AfterBeanDiscoveryImpl impl
webBeansContext.getWebBeansUtil().defineManagedBeanWithoutFireEvents(
(AnnotatedType<?>) annotatedType);
- CustomInterceptorBean<?> interceptor = new
CustomInterceptorBean(managedBean, (Interceptor<?>)bean);
+ Interceptor<?> interceptor = (Interceptor<?>)bean;
if(interceptor.getScope() != Dependent.class)
{
if(logger.isLoggable(Level.WARNING))
@@ -109,7 +108,7 @@ public class AfterBeanDiscoveryImpl impl
InterceptorsManager interceptorsManager =
webBeansContext.getInterceptorsManager();
interceptorsManager.addInterceptor(interceptor);
-
webBeansContext.getInterceptorsManager().addCustomInterceptorClass(bean.getBeanClass());
+ interceptorsManager.addCustomInterceptorClass(bean.getBeanClass());
}
else if(bean instanceof Decorator)
