[jboss-cvs] JBossAS SVN: r68573 - projects/aop/trunk/aop/src/main/org/jboss/aop.

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

Author: flavia.rainone at jboss.com
Date: 2007-12-26 16:05:31 -0500 (Wed, 26 Dec 2007)
New Revision: 68573

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java
Log:
[JBAOP-497] Bug fixed.

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java	2007-12-26 19:29:25 UTC (rev 68572)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java	2007-12-26 21:05:31 UTC (rev 68573)
@@ -530,7 +530,7 @@
       }
       if (metadata != null)
       {
-         if (hasJoinPointAnnotationFromStringName(m.getDeclaringClass(), new MethodSignature(m), annotation))
+         if (hasJoinPointAnnotation(m.getDeclaringClass(), new MethodSignature(m), annotationClass))
          {
             return true;
          }
@@ -615,12 +615,7 @@
                Class annotationClass = cl.loadClass(annotationName);
                if (annotationClass != null)
                {
-                  MetaData md = metadata.getComponentMetaData(sig);
-                  if (md != null)
-                  {
-                     if (md.isAnnotationPresent(annotationClass))
-                        return true;
-                  }
+                  return this.hasJoinPointAnnotation(declaringClass, sig, annotationClass);
                }
             }
          }
@@ -636,6 +631,23 @@
       return false;
    }
    
+   private boolean hasJoinPointAnnotation(Class declaringClass, org.jboss.metadata.spi.signature.Signature sig, Class annotationClass)
+   {
+      if (metadata != null)
+      {
+         if (annotationClass != null)
+         {
+            MetaData md = metadata.getComponentMetaData(sig);
+            if (md != null)
+            {
+               if (md.isAnnotationPresent(annotationClass))
+                  return true;
+            }
+         }
+      }
+      return false;
+   }
+   
    public boolean hasAnnotation(CtClass clazz, String annotation)
    {
       if (annotations.hasClassAnnotation(annotation)) return true;