WELD-1045 ProcessBeanAttributes not fired for interceptors and decora…

…tors
weld · Jan 11, 2012 · 5098c85 · 5098c85
1 parent ff0a58b
commit 5098c85
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java b/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java
@@ -238,13 +238,21 @@ protected <T> void createNewManagedBean(WeldClass<T> annotatedClass) {
     protected <T> void createDecorator(WeldClass<T> weldClass) {
         BeanAttributes<T> attributes = BeanAttributesFactory.forManagedBean(weldClass, getManager());
         DecoratorImpl<T> bean = DecoratorImpl.of(attributes, weldClass, manager, services);
-        getEnvironment().addDecorator(bean);
+        // fire ProcessBeanAttributes for decorator
+        boolean vetoed = fireProcessBeanAttributes(bean);
+        if (!vetoed) {
+            getEnvironment().addDecorator(bean);
+        }
     }
 
     protected <T> void createInterceptor(WeldClass<T> weldClass) {
         BeanAttributes<T> attributes = BeanAttributesFactory.forManagedBean(weldClass, getManager());
         InterceptorImpl<T> bean = InterceptorImpl.of(attributes, weldClass, manager, services);
-        getEnvironment().addInterceptor(bean);
+        // fire ProcessBeanAttributes for decorator
+        boolean vetoed = fireProcessBeanAttributes(bean);
+        if (!vetoed) {
+            getEnvironment().addInterceptor(bean);
+        }
     }
 
     protected <T> SessionBean<T> createSessionBean(InternalEjbDescriptor<T> descriptor) {

diff --git a/jboss-tck-runner/1.1/src/test/resources/tck-tests.xml b/jboss-tck-runner/1.1/src/test/resources/tck-tests.xml
@@ -163,13 +163,6 @@
                     <exclude name="testProcessInjectionTargetEventFiredForMessageDrivenBean" />
                 </methods>
             </class>
-            <!-- WELD-1045 -->
-             <class name="org.jboss.jsr299.tck.tests.extensions.lifecycle.processBeanAttributes.VerifyValuesTest">
-                <methods>
-                    <exclude name="testInterceptorBeanAttributes" />
-                    <exclude name="testDecoratorBeanAttributes" />
-                </methods>
-            </class>
             <!-- WELD-1046 -->
             <class name="org.jboss.jsr299.tck.tests.extensions.lifecycle.processBeanAttributes.VerifyValuesTest">
                 <methods>