[jboss-cvs] JBossAS SVN: r62291 - projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/metadata.

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

Author: alesj
Date: 2007-04-12 04:22:14 -0400 (Thu, 12 Apr 2007)
New Revision: 62291

Modified:
   projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/metadata/AbstractOSGiMetaData.java
   projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/metadata/OSGiParameters.java
Log:
check null - so that we don't push null into map.

Modified: projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/metadata/AbstractOSGiMetaData.java
===================================================================
--- projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/metadata/AbstractOSGiMetaData.java	2007-04-12 08:18:26 UTC (rev 62290)
+++ projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/metadata/AbstractOSGiMetaData.java	2007-04-12 08:22:14 UTC (rev 62291)
@@ -152,13 +152,13 @@
          if (attribute != null)
          {
             value = creator.createValue(attribute);
-            cachedAttributes.put(key, value);
          }
          else if (defaultValue != null)
          {
             value = defaultValue;
+         }
+         if (value != null)
             cachedAttributes.put(key, value);
-         }
       }
       return value;
    }

Modified: projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/metadata/OSGiParameters.java
===================================================================
--- projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/metadata/OSGiParameters.java	2007-04-12 08:18:26 UTC (rev 62290)
+++ projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/metadata/OSGiParameters.java	2007-04-12 08:22:14 UTC (rev 62291)
@@ -106,20 +106,19 @@
                else
                {
                   log.warn("Unable to create proper value from " + creator + " for parameter: " + parameter);
-                  return null;
                }
             }
             else
             {
                value = creator.createValue(paramValue.toString());
             }
-            cachedAttributes.put(key, value);
          }
          else if (defaultValue != null)
          {
             value = defaultValue;
-            cachedAttributes.put(key, value);
          }
+         if (value != null)
+            cachedAttributes.put(key, value);
       }
       return value;
    }