[jboss-cvs] JBossAS SVN: r109557 - projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss.

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

Author: jaikiran
Date: 2010-11-30 09:26:52 -0500 (Tue, 30 Nov 2010)
New Revision: 109557

Modified:
   projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
Log:
JBMETA-317 Consider the interceptor-order while returning the applicable interceptors for a bean

Modified: projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
===================================================================
--- projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java	2010-11-30 14:19:06 UTC (rev 109556)
+++ projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java	2010-11-30 14:26:52 UTC (rev 109557)
@@ -1240,7 +1240,15 @@
             {
                includeDefaultInterceptors = true;
             }
-            InterceptorClassesMetaData interceptorClasses = binding.getInterceptorClasses();
+            InterceptorClassesMetaData interceptorClasses = null;
+            if (binding.isTotalOrdering())
+            {
+               interceptorClasses = binding.getInterceptorOrder();
+            }
+            else
+            {
+               interceptorClasses = binding.getInterceptorClasses();
+            }
             // interceptor binding has no classes, so move on to the next interceptor binding
             if (interceptorClasses == null || interceptorClasses.isEmpty())
             {
@@ -1262,7 +1270,15 @@
          }
          else if (binding.getEjbName().equals("*")) // binding for default interceptors
          {
-            InterceptorClassesMetaData interceptorClasses = binding.getInterceptorClasses();
+            InterceptorClassesMetaData interceptorClasses = null;
+            if (binding.isTotalOrdering())
+            {
+               interceptorClasses = binding.getInterceptorOrder();
+            }
+            else
+            {
+               interceptorClasses = binding.getInterceptorClasses();
+            }
             // no interceptor class, so skip to next interceptor binding
             if (interceptorClasses == null || interceptorClasses.isEmpty())
             {