[jboss-cvs] JBossAS SVN: r82010 - trunk/system/src/main/org/jboss/system/server/profileservice/persistence.

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

Author: emuckenhuber
Date: 2008-12-03 11:34:44 -0500 (Wed, 03 Dec 2008)
New Revision: 82010

Modified:
   trunk/system/src/main/org/jboss/system/server/profileservice/persistence/ManagedObjectUpdateHandler.java
Log:
[JBAS-6037] ignore null values.

Modified: trunk/system/src/main/org/jboss/system/server/profileservice/persistence/ManagedObjectUpdateHandler.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/persistence/ManagedObjectUpdateHandler.java	2008-12-03 15:27:01 UTC (rev 82009)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/persistence/ManagedObjectUpdateHandler.java	2008-12-03 16:34:44 UTC (rev 82010)
@@ -347,6 +347,9 @@
             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"),
@@ -370,7 +373,7 @@
    protected MetaValue processGenericValue(PersistedGenericValue genericElement, GenericValue value)
    {
       PersistedManagedObject po = genericElement.getManagedObject();
-      if(po == null)
+      if(po == null || value.getValue() == null)
          return value;
 
       if(value.getValue() instanceof ManagedObject)