You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/03/28 05:58:44 UTC

svn commit: r523157 - /incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java

Author: dblevins
Date: Tue Mar 27 20:58:43 2007
New Revision: 523157

URL: http://svn.apache.org/viewvc?view=rev&rev=523157
Log:
Moved exclusion check to top of loop where it should be.

Modified:
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java?view=diff&rev=523157&r1=523156&r2=523157
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java Tue Mar 27 20:58:43 2007
@@ -228,6 +228,8 @@
         for (InterceptorBindingInfo info : bindings) {
             Level level = level(info);
 
+            if (excludes.contains(level)) continue;
+
             if (!implies(method, ejbName, level, info)) continue;
 
             Type type = type(level, info);
@@ -254,11 +256,9 @@
                 continue;
             }
 
-            if (!excludes.contains(level)){
-                methodBindings.add(info);
-                if (info.excludeClassInterceptors) excludes.add(Level.CLASS);
-                if (info.excludeDefaultInterceptors) excludes.add(Level.PACKAGE);
-            }
+            methodBindings.add(info);
+            if (info.excludeClassInterceptors) excludes.add(Level.CLASS);
+            if (info.excludeDefaultInterceptors) excludes.add(Level.PACKAGE);
         }
         return methodBindings;
     }