[jboss-cvs] JBossAS SVN: r94084 - 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-29 01:20:29 -0400 (Tue, 29 Sep 2009)
New Revision: 94084

Modified:
   projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/Advisor.java
Log:
[JBAOP-750] Previous fix was still no good, breaking a few tests.

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-29 05:14:46 UTC (rev 94083)
+++ projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/Advisor.java	2009-09-29 05:20:29 UTC (rev 94084)
@@ -887,9 +887,16 @@
       try
       {
          // if annotationClass is null, it means that annotation is not null
-         if ((annotationClass == null && annotations.hasAnnotation(m, annotation))
-             || annotations.hasAnnotation(m, annotationClass))
-    		 return true;
+         if (annotationClass != null)
+         {
+            if (annotations.hasAnnotation(m, annotationClass))
+               return true;
+         }
+         else
+         {
+            if (annotations.hasAnnotation(m, annotation))
+               return true;
+         }
       }
       catch(Exception ignore)
       {