tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r607050 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Date Thu, 27 Dec 2007 12:21:44 GMT
Author: jlaskowski
Date: Thu Dec 27 04:21:44 2007
New Revision: 607050

URL: http://svn.apache.org/viewvc?rev=607050&view=rev
Log:
OPENEJB-740 Business method interceptor methods defined by the bean class's superclasses are
not invoked

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=607050&r1=607049&r2=607050&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Thu Dec 27 04:21:44 2007
@@ -688,8 +688,8 @@
                     }
                 }
 
-                Interceptors interceptors = clazz.getAnnotation(Interceptors.class);
-                if (interceptors != null) {
+                for (Class<?> interceptorsAnnotatedClass : inheritedClassFinder.findAnnotatedClasses(Interceptors.class))
{
+                    Interceptors interceptors = interceptorsAnnotatedClass.getAnnotation(Interceptors.class);
                     EjbJar ejbJar = ejbModule.getEjbJar();
                     for (Class interceptor : interceptors.value()) {
                         if (ejbJar.getInterceptor(interceptor.getName()) == null) {
@@ -706,7 +706,7 @@
                 }
 
                 for (Method method : classFinder.findAnnotatedMethods(Interceptors.class))
{
-                    interceptors = method.getAnnotation(Interceptors.class);
+                    Interceptors interceptors = method.getAnnotation(Interceptors.class);
                     if (interceptors != null) {
                         EjbJar ejbJar = ejbModule.getEjbJar();
                         for (Class interceptor : interceptors.value()) {



Mime
View raw message