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

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

Author: flavia.rainone at jboss.com
Date: 2008-01-05 13:55:56 -0500 (Sat, 05 Jan 2008)
New Revision: 68637

Modified:
   projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/pointcut/Util.java
Log:
[JBAOP-505] Bug solved.

Modified: projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/pointcut/Util.java
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/pointcut/Util.java	2008-01-05 00:00:54 UTC (rev 68636)
+++ projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/pointcut/Util.java	2008-01-05 18:55:56 UTC (rev 68637)
@@ -712,8 +712,8 @@
       Advisor advisor;
       ArrayList astParameters;
       final long paramsLength;
-      int asti;
-      int actuali;
+      private int asti;
+      private int actuali;
       
       ParameterMatcher(Advisor advisor, ArrayList parameters, Object[] params)
       {
@@ -791,8 +791,12 @@
          {
             // backtracking: try to compare as is; if result is false, use wildcard
             // to skip unmatched parameters
+            int currentAsti = asti;
+            int currentActuali = actuali;
             while(!matches(asti, actuali) && actuali < paramsLength)
             {
+               asti = currentAsti;
+               actuali = currentActuali;
                do
                {
                   actuali++;