[jboss-cvs] JBossAS SVN: r88351 - projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop.

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

Author: stalep
Date: 2009-05-07 07:33:52 -0400 (Thu, 07 May 2009)
New Revision: 88351

Modified:
   projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/Advisor.java
Log:
[JBAOP-723]
changed it to use class if class != null.


Modified: projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/Advisor.java
===================================================================
--- projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/Advisor.java	2009-05-07 11:32:48 UTC (rev 88350)
+++ projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/Advisor.java	2009-05-07 11:33:52 UTC (rev 88351)
@@ -887,7 +887,11 @@
 
       try
       {
-         if (annotations.hasAnnotation(m, annotation)) return true;
+         if (annotationClass != null && annotations.hasAnnotation(m, annotationClass)) 
+            return true;
+
+         else if (annotations.hasAnnotation(m, annotation)) return true;
+
       }
       catch(Exception ignore)
       {
@@ -2144,4 +2148,4 @@
       ConstructorInfo[] otherInfos = other.getConstructorInfos();
       return JoinPointComparator.hasSameConstructorAspectLength(myInfos, otherInfos);
    }
-}
\ No newline at end of file
+}