[jboss-cvs] JBossAS SVN: r84179 - trunk/system-jmx/src/main/org/jboss/system/deployers/managed.

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

Author: emuckenhuber
Date: 2009-02-13 10:27:39 -0500 (Fri, 13 Feb 2009)
New Revision: 84179

Modified:
   trunk/system-jmx/src/main/org/jboss/system/deployers/managed/ServiceMetaDataICF.java
Log:
ignore null values for now.

Modified: trunk/system-jmx/src/main/org/jboss/system/deployers/managed/ServiceMetaDataICF.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/deployers/managed/ServiceMetaDataICF.java	2009-02-13 15:25:39 UTC (rev 84178)
+++ trunk/system-jmx/src/main/org/jboss/system/deployers/managed/ServiceMetaDataICF.java	2009-02-13 15:27:39 UTC (rev 84179)
@@ -238,9 +238,17 @@
                break;
             }
          }
+
+         // Unwrap
+         PropertyInfo propertyInfo = beanInfo.getProperty(name);
+         Object plainValue = metaValueFactory.unwrap(value, propertyInfo.getType());
+         
          // There may not be an attribute value, see if there is a matching property
          if (attributeValue == null)
          {
+            // FIXME ignore null values
+            if(plainValue == null) return;
+            
             String aname = mapAttributeName(md, name);
             if(aname != null)
             {
@@ -253,9 +261,6 @@
          }
          if (attributeValue != null)
          {
-            PropertyInfo propertyInfo = beanInfo.getProperty(name);
-            Object plainValue = metaValueFactory.unwrap(value, propertyInfo.getType());
-   
             // Unwrap the ServiceValueMetaData types
             if (attributeValue instanceof ServiceTextValueMetaData)
             {