[jboss-cvs] JBossAS SVN: r82918 - in branches/Branch_5_0/system/src/main/org/jboss/system/server/profileservice: repository and 1 other directory.

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

Author: emuckenhuber
Date: 2009-01-15 11:37:27 -0500 (Thu, 15 Jan 2009)
New Revision: 82918

Modified:
   branches/Branch_5_0/system/src/main/org/jboss/system/server/profileservice/persistence/ManagedObjectUpdateHandler.java
   branches/Branch_5_0/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java
Log:
port cleanup and JBAS-6360 from 5_x branch

Modified: branches/Branch_5_0/system/src/main/org/jboss/system/server/profileservice/persistence/ManagedObjectUpdateHandler.java
===================================================================
--- branches/Branch_5_0/system/src/main/org/jboss/system/server/profileservice/persistence/ManagedObjectUpdateHandler.java	2009-01-15 16:34:35 UTC (rev 82917)
+++ branches/Branch_5_0/system/src/main/org/jboss/system/server/profileservice/persistence/ManagedObjectUpdateHandler.java	2009-01-15 16:37:27 UTC (rev 82918)
@@ -45,7 +45,6 @@
 import org.jboss.metatype.api.types.CollectionMetaType;
 import org.jboss.metatype.api.types.CompositeMetaType;
 import org.jboss.metatype.api.types.EnumMetaType;
-import org.jboss.metatype.api.types.GenericMetaType;
 import org.jboss.metatype.api.types.MetaType;
 import org.jboss.metatype.api.types.Name;
 import org.jboss.metatype.api.types.SimpleMetaType;
@@ -59,7 +58,6 @@
 import org.jboss.metatype.api.values.EnumValue;
 import org.jboss.metatype.api.values.EnumValueSupport;
 import org.jboss.metatype.api.values.GenericValue;
-import org.jboss.metatype.api.values.GenericValueSupport;
 import org.jboss.metatype.api.values.MetaValue;
 import org.jboss.metatype.api.values.MetaValueFactory;
 import org.jboss.metatype.api.values.SimpleValue;
@@ -341,22 +339,6 @@
          MetaValue newValue = processMetaValue(i.next(), item);
          if(newValue != null)
          {
-            MetaType metaType = newValue.getMetaType();
-            
-            // FIXME unwrap a managedObject
-            if( metaType.isGeneric() )
-            {
-               ManagedObject mo = (ManagedObject) ((GenericValue) newValue).getValue();
-               // Ignore null values
-               if(mo == null)
-                  continue;
-               // Use the attachment instead of the MO, to avoid a CCE
-               newValue = new GenericValueSupport(
-                     new GenericMetaType(mo.getAttachmentName(), "mo"),
-                     mo.getAttachmentName()
-                     );
-            }
-            
             elementList.add(newValue);
          }
       }

Modified: branches/Branch_5_0/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java
===================================================================
--- branches/Branch_5_0/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java	2009-01-15 16:34:35 UTC (rev 82917)
+++ branches/Branch_5_0/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java	2009-01-15 16:37:27 UTC (rev 82918)
@@ -640,6 +640,8 @@
     */
    protected boolean hasBeenModified(VFSDeploymentContext deploymentContext) throws IOException
    {
+      // hasBeenModified
+      boolean hasBeenModfied = false;
       List<VirtualFile> metadataLocations = deploymentContext.getMetaDataLocations();
       if (metadataLocations != null && metadataLocations.isEmpty() == false)
       {
@@ -658,7 +660,7 @@
                   {
                      if (log.isTraceEnabled())
                         log.trace("Metadata location modified: " + child);
-                     return true;
+                     hasBeenModfied = true;
                   }
                }
             }
@@ -672,11 +674,11 @@
             if (childContext instanceof VFSDeploymentContext)
             {
                if (hasBeenModified((VFSDeploymentContext)childContext))
-                  return true;
+                  hasBeenModfied = true;
             }
          }
       }
-      return false;
+      return hasBeenModfied;
    }