[jboss-cvs] JBossAS SVN: r86764 - in projects/microcontainer/trunk/kernel/src/main/java/org/jboss: kernel/plugins/annotations and 1 other directory.

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

Author: alesj
Date: 2009-04-03 15:34:25 -0400 (Fri, 03 Apr 2009)
New Revision: 86764

Modified:
   projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/api/annotations/MCAnnotations.java
   projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java
Log:
Ignore empty array.

Modified: projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/api/annotations/MCAnnotations.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/api/annotations/MCAnnotations.java	2009-04-03 19:08:31 UTC (rev 86763)
+++ projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/api/annotations/MCAnnotations.java	2009-04-03 19:34:25 UTC (rev 86764)
@@ -41,12 +41,12 @@
     *
     * @return the possible annotation classes
     */
-   Class<? extends Annotation>[] value();
+   Class<? extends Annotation>[] value() default {};
 
    /**
     * Should we ignore IoC annotations lookup.
     *
-    * @return true if we should ignore IoC annotations scan,
+    * @return true if we should ignore IoC annotations scan, false otherwise
     */
    boolean ignore() default false;
 }

Modified: projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java	2009-04-03 19:08:31 UTC (rev 86763)
+++ projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java	2009-04-03 19:34:25 UTC (rev 86764)
@@ -246,10 +246,10 @@
 
       // limit the annotations
       MCAnnotations annotations = retrieval.getAnnotation(MCAnnotations.class);
-      if (annotations != null && annotations.ignore())
+      if (annotations != null && (annotations.ignore() || annotations.value().length == 0))
       {
          if (trace)
-            log.trace("Ignoring annotations lookup");
+            log.trace("Ignoring annotations lookup: " + annotations);
 
          return;
       }