svn commit: r916806 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java

[covener]

Author: covener
Date: Fri Feb 26 20:20:17 2010
New Revision: 916806

URL: http://svn.apache.org/viewvc?rev=916806&view=rev
Log:
OWB-311 properly remove class-level interceptors when a method
is annotated with nothing but with @ExcludeClassInterceptors.

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java?rev=916806&r1=916805&r2=916806&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
 Fri Feb 26 20:20:17 2010
@@ -283,29 +283,23 @@
             }
         }
 
-        if (isMethodAnnotatedWithInterceptorClass)
+        if (isMethodAnnotatedWithExcludeInterceptorClass)
         {
-
-            if (isMethodAnnotatedWithExcludeInterceptorClass)
-            {
-                // If the interceptor is defined at the class level it should 
be
-                // removed due to ExcludeClassInterceptors method annotation
-                if (!id.isDefinedInMethod() && 
id.isDefinedInInterceptorClass())
-                {
-                    return true;
-                }
-            }
-            // If the interceptor is defined in a different method, remove it
-            if (id.isDefinedInMethod() && 
!id.getInterceptorBindingMethod().equals(method))
+            // If the interceptor is defined at the class level it should be
+            // removed due to ExcludeClassInterceptors method annotation
+            if (!id.isDefinedInMethod() && id.isDefinedInInterceptorClass())
             {
                 return true;
             }
         }
-        else if (id.isDefinedInMethod())
+        
+        // If the interceptor is defined in a different method, remove it
+        if (id.isDefinedInMethod() && 
!id.getInterceptorBindingMethod().equals(method))
         {
             return true;
         }
 
+        
         return false;
     }