[jboss-cvs] JBossAS SVN: r76041 - projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/advice.

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

Author: flavia.rainone at jboss.com
Date: 2008-07-20 19:33:43 -0400 (Sun, 20 Jul 2008)
New Revision: 76041

Modified:
   projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/advice/PrecedenceSorter.java
Log:
[JBAOP-616] Updated PrecedenceSorter according to the new changes, and optimized it by not skipping sorting
when there is only one interceptor.

Modified: projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/advice/PrecedenceSorter.java
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/advice/PrecedenceSorter.java	2008-07-20 23:31:45 UTC (rev 76040)
+++ projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/advice/PrecedenceSorter.java	2008-07-20 23:33:43 UTC (rev 76041)
@@ -100,6 +100,11 @@
             CFlowInterceptor icptr = (CFlowInterceptor)interceptor;
             interceptorName = icptr.getName();
          }
+         else if (interceptor instanceof GeneratedAdvisorInterceptor)
+         {
+            interceptorName = ((GeneratedAdvisorInterceptor) interceptor).isInterceptor()?
+               interceptor.getName(): interceptor.getClass().getName();
+         }
          else
          {
             interceptorName = interceptor.getClass().getName();
@@ -239,7 +244,7 @@
 
    public static Interceptor[] applyPrecedence(Interceptor[] interceptors, AspectManager manager)
    {
-      if (interceptors.length == 0)
+      if (interceptors.length == 0 || interceptors.length == 1)
          return interceptors;
 
       ArrayList<InterceptorEntry> all = new ArrayList<InterceptorEntry>(interceptors.length);