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

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

Author: flavia.rainone at jboss.com
Date: 2009-09-30 15:17:13 -0400 (Wed, 30 Sep 2009)
New Revision: 94179

Modified:
   projects/aop/trunk/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/trunk/aop/src/main/java/org/jboss/aop/Advisor.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/Advisor.java	2009-09-30 19:05:48 UTC (rev 94178)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/Advisor.java	2009-09-30 19:17:13 UTC (rev 94179)
@@ -886,8 +886,17 @@
 
       try
       {
-         if (annotationClass != null && annotations.hasAnnotation(m, annotationClass)) 
-            return true;         
+         // if annotationClass is null, it means that annotation is not null
+         if (annotationClass != null)
+         {
+            if (annotations.hasAnnotation(m, annotationClass))
+               return true;
+         }
+         else
+         {
+            if (annotations.hasAnnotation(m, annotation))
+               return true;
+         }
       }
       catch(Exception ignore)
       {