Author: pete.muir(a)jboss.org
Date: 2010-01-11 18:13:03 -0500 (Mon, 11 Jan 2010)
New Revision: 5433
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bean/InterceptorImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java
Log:
WELD-78
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/InterceptorImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/InterceptorImpl.java 2010-01-11
23:08:56 UTC (rev 5432)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/InterceptorImpl.java 2010-01-11
23:13:03 UTC (rev 5433)
@@ -42,11 +42,12 @@
*/
public class InterceptorImpl<T> extends ManagedBean<T> implements
Interceptor<T>
{
+
private final InterceptorClassMetadata interceptorClassMetadata;
private final Set<Annotation> interceptorBindingTypes;
- private boolean serializable;
+ private final boolean serializable;
protected InterceptorImpl(WeldClass<T> type, BeanManagerImpl manager)
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java 2010-01-11
23:08:56 UTC (rev 5432)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java 2010-01-11
23:13:03 UTC (rev 5433)
@@ -55,11 +55,8 @@
{
// The underlying method
private MethodInjectionPoint<T, X> method;
-
private DisposalMethod<X, ?> disposalMethodBean;
-
private ProducerMethod<?, ?> specializedBean;
-
private final String id;
/**
@@ -164,7 +161,7 @@
// TODO use annotated item?
for (Type type : getDeclaringBean().getTypes())
{
- if (type instanceof Class)
+ if (type instanceof Class<?>)
{
if (SecureReflections.methodExists((Class<?>) type,
getWeldAnnotated().getName(), getWeldAnnotated().getParameterTypesAsArray()))
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java 2010-01-11 23:08:56
UTC (rev 5432)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java 2010-01-11 23:13:03
UTC (rev 5433)
@@ -392,7 +392,7 @@
{
for (Type type : getTypes())
{
- if (type instanceof Class)
+ if (type instanceof Class<?>)
{
for (Method m : SecureReflections.getMethods((Class<?>) type))
{
@@ -427,7 +427,9 @@
{
InterceptionModel<Class<?>,
SerializableContextual<javax.enterprise.inject.spi.Interceptor<?>, ?>>
model =
beanManager.getCdiInterceptorsRegistry().getInterceptionModel(ejbDescriptor.getBeanClass());
if (model != null)
+ {
getManager().getServices().get(EjbServices.class).registerInterceptors(getEjbDescriptor().delegate(),
new InterceptorBindingsAdapter(model));
+ }
}
}
Show replies by date