[jboss-cvs] JBossAS SVN: r76101 - trunk/server/src/main/org/jboss/deployment.

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

Author: emuckenhuber
Date: 2008-07-22 09:34:10 -0400 (Tue, 22 Jul 2008)
New Revision: 76101

Modified:
   trunk/server/src/main/org/jboss/deployment/AnnotatedClassFilter.java
Log:
[JBAS-5674] also check for method and field annotations for web deployments

Modified: trunk/server/src/main/org/jboss/deployment/AnnotatedClassFilter.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/AnnotatedClassFilter.java	2008-07-22 12:13:12 UTC (rev 76100)
+++ trunk/server/src/main/org/jboss/deployment/AnnotatedClassFilter.java	2008-07-22 13:34:10 UTC (rev 76101)
@@ -119,15 +119,15 @@
          {
             className = getClassName(file);
             Class<?> c = loader.loadClass(className);
-            Annotation[] annotations = c.getAnnotations();
+            boolean hasAnnotations = hasAnnotations(c);
             boolean includeClass = false;
             if(clientClassName != null)
             {
-               includeClass = className.equals(clientClassName) && hasAnnotations(c);
+               includeClass = className.equals(clientClassName) && hasAnnotations;
             }
             else
             {
-               includeClass = (annotations != null && annotations.length > 0);
+               includeClass = hasAnnotations;
             }
 
             if(includeClass)