[jboss-cvs] JBossAS SVN: r77324 - in projects/aop/trunk/aop/src/main/org/jboss/aop: advice and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2008-08-21 11:52:20 -0400 (Thu, 21 Aug 2008)
New Revision: 77324

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManagerAnnotationLoaderStrategy.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/advice/PrecedenceSorter.java
Log:
[JBAOP-627] AspectManagerAnnotationLoaderStrategy.undeployPrecedence() should remove precedence from AM. It was wrongly trying to remove a pointcut

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManagerAnnotationLoaderStrategy.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManagerAnnotationLoaderStrategy.java	2008-08-21 15:39:31 UTC (rev 77323)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManagerAnnotationLoaderStrategy.java	2008-08-21 15:52:20 UTC (rev 77324)
@@ -175,7 +175,7 @@
    
    public void undeployPrecedence(AspectAnnotationLoader loader, String name)
    {
-      loader.getAspectManager().removePointcut(name);
+      loader.getAspectManager().removePrecedence(name);
    }
 
    public void deployTypedef(AspectAnnotationLoader loader, String name, String expr) throws Exception

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/PrecedenceSorter.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/PrecedenceSorter.java	2008-08-21 15:39:31 UTC (rev 77323)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/PrecedenceSorter.java	2008-08-21 15:52:20 UTC (rev 77324)
@@ -136,21 +136,24 @@
 
    private static boolean matches(InterceptorEntry ientry, PrecedenceDefEntry pentry)
    {
-      if (ientry.classname.equals(pentry.interceptorClass))
+      if (ientry.classname != null && pentry.interceptorClass != null)
       {
-         if (ientry.method == null)
+         if (ientry.classname.equals(pentry.interceptorClass))
          {
-            if (pentry.adviceMethod == null)
+            if (ientry.method == null)
             {
-               return true;
+               if (pentry.adviceMethod == null)
+               {
+                  return true;
+               }
             }
+            else if (pentry.adviceMethod != null)
+            {
+               //This was:
+               //return ientry.classname.equals(pentry.interceptorClass);
+               return ientry.method.equals(pentry.adviceMethod);
+            }
          }
-         else if (pentry.adviceMethod != null)
-         {
-            //This was:
-            //return ientry.classname.equals(pentry.interceptorClass);
-            return ientry.method.equals(pentry.adviceMethod);
-         }
       }
       return false;
    }