[weld-commits] Weld SVN: r5658 - core/trunk/impl/src/main/java/org/jboss/weld/bean.
Author: pete.muir(a)jboss.org
Date: 2010-01-28 17:32:55 -0500 (Thu, 28 Jan 2010)
New Revision: 5658
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java
Log:
WELD-393
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java 2010-01-28
22:11:46 UTC (rev 5657)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java 2010-01-28
22:32:55 UTC (rev 5658)
@@ -579,6 +579,11 @@
beanManager.getClassDeclaredInterceptorsRegistry().registerInterceptionModel(getType(),
builder.build());
}
}
+ else
+ {
+ InterceptorClassMetadata interceptorClassMetadata =
InterceptorClassMetadataRegistry.getRegistry().getInterceptorClassMetadata(getType(),
true);
+ hasSerializationOrInvocationInterceptorMethods =
!interceptorClassMetadata.getInterceptorMethods(org.jboss.interceptor.model.InterceptionType.AROUND_INVOKE).isEmpty()
||
!interceptorClassMetadata.getInterceptorMethods(org.jboss.interceptor.model.InterceptionType.AROUND_TIMEOUT).isEmpty()
||
!interceptorClassMetadata.getInterceptorMethods(org.jboss.interceptor.model.InterceptionType.PRE_PASSIVATE).isEmpty()
||
!interceptorClassMetadata.getInterceptorMethods(org.jboss.interceptor.model.InterceptionType.POST_ACTIVATE).isEmpty();
+ }
}
protected void checkConstructor()
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java 2010-01-28 22:11:46
UTC (rev 5657)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java 2010-01-28 22:32:55
UTC (rev 5658)
@@ -33,6 +33,8 @@
import java.util.List;
import java.util.Set;
+import javassist.util.proxy.MethodHandler;
+
import javax.enterprise.context.Dependent;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Decorator;
@@ -41,7 +43,6 @@
import javax.enterprise.inject.spi.Interceptor;
import javax.enterprise.inject.spi.PassivationCapable;
-import javassist.util.proxy.MethodHandler;
import org.jboss.interceptor.proxy.InterceptionHandlerFactory;
import org.jboss.interceptor.proxy.InterceptorProxyCreatorImpl;
import org.jboss.interceptor.registry.InterceptorRegistry;
@@ -362,10 +363,6 @@
initPreDestroy();
initEEInjectionPoints();
initPassivationCapable();
- if (isInterceptionCandidate())
- {
- initDirectlyDefinedInterceptors();
- }
setInjectionTarget(new ManagedBeanInjectionTarget<T>(this));
}
}