[jboss-cvs] JBossAS SVN: r90038 - projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins.

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

Author: scott.stark at jboss.org
Date: 2009-06-10 01:59:56 -0400 (Wed, 10 Jun 2009)
New Revision: 90038

Modified:
   projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/DefaultFieldsImpl.java
   projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/ManagedObjectImpl.java
Log:
JBMAN-86, mark the attachments as transient
JBMAN-87, skip the serialization of the fields ANNOTATIONS


Modified: projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/DefaultFieldsImpl.java
===================================================================
--- projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/DefaultFieldsImpl.java	2009-06-10 05:56:34 UTC (rev 90037)
+++ projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/DefaultFieldsImpl.java	2009-06-10 05:59:56 UTC (rev 90038)
@@ -356,8 +356,11 @@
       {
          if(entry.getKey().equals(PROPERTY_INFO))
             continue;
-         if(entry.getKey().equals(ATTACHMENT))
+         else if(entry.getKey().equals(ATTACHMENT))
             continue;
+         else if(entry.getKey().equals(ANNOTATIONS))
+            continue;
+
          out.writeUTF(entry.getKey());
          out.writeObject(entry.getValue());
       }

Modified: projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/ManagedObjectImpl.java
===================================================================
--- projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/ManagedObjectImpl.java	2009-06-10 05:56:34 UTC (rev 90037)
+++ projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/ManagedObjectImpl.java	2009-06-10 05:59:56 UTC (rev 90038)
@@ -44,7 +44,7 @@
 public class ManagedObjectImpl implements MutableManagedObject
 {
    /** The serialVersionUID */
-   private static final long serialVersionUID = 2L;
+   private static final long serialVersionUID = 3L;
 
    /** The object name used for ManagementRef resolution */
    private String name;
@@ -56,7 +56,7 @@
    /** The attachment */
    private transient Object attachment;
    /** The object annotations <Class name, Annotation> */
-   private Map<String, Annotation> annotations = Collections.emptyMap();
+   private transient Map<String, Annotation> annotations = Collections.emptyMap();
    /** The properties */
    private Map<String, ManagedProperty> properties;
    /** The operations */