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

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

Author: scott.stark at jboss.org
Date: 2008-05-09 05:03:58 -0400 (Fri, 09 May 2008)
New Revision: 73201

Modified:
   trunk/server/src/main/org/jboss/deployment/AnnotatedClassFilter.java
Log:
If there is a clientClassName only accept that class if it has annotations

Modified: trunk/server/src/main/org/jboss/deployment/AnnotatedClassFilter.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/AnnotatedClassFilter.java	2008-05-09 08:24:26 UTC (rev 73200)
+++ trunk/server/src/main/org/jboss/deployment/AnnotatedClassFilter.java	2008-05-09 09:03:58 UTC (rev 73201)
@@ -119,8 +119,16 @@
             className = getClassName(file);
             Class<?> c = loader.loadClass(className);
             Annotation[] annotations = c.getAnnotations();
-            boolean includeClass = (annotations != null && annotations.length > 0)
-               || (className.equals(clientClassName) && hasAnnotations(c));
+            boolean includeClass = false;
+            if(clientClassName != null)
+            {
+               includeClass = className.equals(clientClassName) && hasAnnotations(c);
+            }
+            else
+            {
+               includeClass = (annotations != null && annotations.length > 0);
+            }
+
             if(includeClass)
             {
                pathToClasses.put(file, c);