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

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

Author: flavia.rainone at jboss.com
Date: 2009-09-28 17:17:36 -0400 (Mon, 28 Sep 2009)
New Revision: 94078

Modified:
   projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/Advisor.java
Log:
[JBAOP-750] Previous fix was causing some tests to fail (at AnnotationOverrideTestCase and DynamicTester classes). The point is that the second if was not always implying in double-checking hasAnnotation; the second if was actually needed in a few scenarios.

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-09-28 20:37:04 UTC (rev 94077)
+++ projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/Advisor.java	2009-09-28 21:17:36 UTC (rev 94078)
@@ -886,8 +886,10 @@
 
       try
       {
-         if (annotationClass != null && annotations.hasAnnotation(m, annotationClass)) 
-            return true;
+         // if annotationClass is null, it means that annotation is not null
+         if ((annotationClass == null && annotations.hasAnnotation(m, annotation))
+             || annotations.hasAnnotation(m, annotationClass))
+    		 return true;
       }
       catch(Exception ignore)
       {