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

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

Author: alesj
Date: 2008-07-20 08:41:55 -0400 (Sun, 20 Jul 2008)
New Revision: 76021

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMX.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/BaseMetaDataAnnotationPlugin.java
Log:
Read cleanup attributes from methods, since they can be overridden.

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMX.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMX.java	2008-07-20 10:07:00 UTC (rev 76020)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMX.java	2008-07-20 12:41:55 UTC (rev 76021)
@@ -36,7 +36,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-public @interface JMX 
+public @interface JMX
 {
    /**
     * The mbean interface the annotated object should expose. Ignored if 

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/BaseMetaDataAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/BaseMetaDataAnnotationPlugin.java	2008-07-20 10:07:00 UTC (rev 76020)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/BaseMetaDataAnnotationPlugin.java	2008-07-20 12:41:55 UTC (rev 76021)
@@ -209,8 +209,8 @@
    {
       buffer.append("@annotation=").append(annotation);
       buffer.append(" ,types=").append(types);
-      buffer.append(" ,cleanup=").append(isCleanup);
-      buffer.append(" ,cleanupOnly=").append(isCleanupOnly);
+      buffer.append(" ,cleanup=").append(isCleanup());
+      buffer.append(" ,cleanupOnly=").append(isCleanupOnly());
    }
 
    public void toShortString(JBossStringBuilder buffer)