[weld-commits] Weld SVN: r6245 - extensions/trunk/src/main/java/org/jboss/weld/extensions/interceptor.

Author: lincolnthree Date: 2010-05-18 13:22:13 -0400 (Tue, 18 May 2010) New Revision: 6245 Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/interceptor/InterceptorExtension.java extensions/trunk/src/main/java/org/jboss/weld/extensions/interceptor/Interceptors.java Log: Fixed bug in InterceptorExtension that was preventing CDI instantiation on GlassFish... Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/interceptor/InterceptorExtension.java =================================================================== --- extensions/trunk/src/main/java/org/jboss/weld/extensions/interceptor/InterceptorExtension.java 2010-05-18 17:04:13 UTC (rev 6244) +++ extensions/trunk/src/main/java/org/jboss/weld/extensions/interceptor/InterceptorExtension.java 2010-05-18 17:22:13 UTC (rev 6245) @@ -27,26 +27,20 @@ public class InterceptorExtension implements Extension { - - private final Collection<Class<?>> enabledInterceptors; - - InterceptorExtension() - { - this.enabledInterceptors = Collections.synchronizedSet(new HashSet<Class<?>>()); - } - @SuppressWarnings("unused") - void observeInterceptors(@Observes ProcessBean<?> pmb) + private final Collection<Class<?>> enabledInterceptors = Collections.synchronizedSet(new HashSet<Class<?>>()); + + void observeInterceptors(@Observes final ProcessBean<?> pmb) { if (pmb.getBean() instanceof Interceptor<?>) { this.enabledInterceptors.add(pmb.getBean().getBeanClass()); } } - + Collection<Class<?>> getEnabledInterceptors() { return enabledInterceptors; } - + } Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/interceptor/Interceptors.java =================================================================== --- extensions/trunk/src/main/java/org/jboss/weld/extensions/interceptor/Interceptors.java 2010-05-18 17:04:13 UTC (rev 6244) +++ extensions/trunk/src/main/java/org/jboss/weld/extensions/interceptor/Interceptors.java 2010-05-18 17:22:13 UTC (rev 6245) @@ -20,17 +20,12 @@ public class Interceptors { - + @Inject private InterceptorExtension interceptorExtension; - - private Interceptors() + + public boolean isInterceptorEnabled(final Class<?> clazz) { - // TODO Auto-generated constructor stub - } - - public boolean isInterceptorEnabled(Class<?> clazz) - { return interceptorExtension.getEnabledInterceptors().contains(clazz); }