[jboss-cvs] JBossAS SVN: r73209 - projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/registry.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2008-05-09 11:20:23 -0400 (Fri, 09 May 2008)
New Revision: 73209

Modified:
   projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/registry/InterceptorRegistry.java
Log:
[EJBTHREE-1348] @ExcludeDefaultInterceptors is ignored for lifecycle interceptors

Modified: projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/registry/InterceptorRegistry.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/registry/InterceptorRegistry.java	2008-05-09 14:26:33 UTC (rev 73208)
+++ projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/registry/InterceptorRegistry.java	2008-05-09 15:20:23 UTC (rev 73209)
@@ -110,7 +110,10 @@
       log.debug("Found default interceptors " + defaultInterceptorClasses);
 //      interceptorClasses.addAll(defaultInterceptorClasses);
       List<Class<?>> lifecycleInterceptorClasses = new ArrayList<Class<?>>();
-      lifecycleInterceptorClasses.addAll(defaultInterceptorClasses);
+      if (!isExcludedDefaultInterceptors(advisor))
+      {
+         lifecycleInterceptorClasses.addAll(defaultInterceptorClasses);
+      }
       
       Interceptors interceptorsAnnotation = (Interceptors) advisor.resolveAnnotation(Interceptors.class);
       List<Class<?>> classInterceptorClasses = new ArrayList<Class<?>>();
@@ -196,6 +199,11 @@
    
    private static final boolean isExcludeDefaultInterceptors(Advisor advisor, Method method)
    {
-      return advisor.hasAnnotation(method, ExcludeDefaultInterceptors.class) || advisor.resolveAnnotation(ExcludeDefaultInterceptors.class) != null;
+      return advisor.hasAnnotation(method, ExcludeDefaultInterceptors.class) || isExcludedDefaultInterceptors(advisor);
    } 
+   
+   private static final boolean isExcludedDefaultInterceptors(Advisor advisor)
+   {
+      return advisor.resolveAnnotation(ExcludeDefaultInterceptors.class) != null;
+   }
 }