[jboss-cvs] JBossAS SVN: r81457 - projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency.

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

Author: alesj
Date: 2008-11-21 19:34:18 -0500 (Fri, 21 Nov 2008)
New Revision: 81457

Modified:
   projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/PropertyDispatchWrapper.java
Log:
[JBMICROCONT-387]; ignore nulifying of primitives.

Modified: projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/PropertyDispatchWrapper.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/PropertyDispatchWrapper.java	2008-11-22 00:21:42 UTC (rev 81456)
+++ projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/PropertyDispatchWrapper.java	2008-11-22 00:34:18 UTC (rev 81457)
@@ -30,6 +30,7 @@
 import org.jboss.beans.metadata.spi.ValueMetaData;
 import org.jboss.kernel.spi.dependency.KernelControllerContext;
 import org.jboss.logging.Logger;
+import org.jboss.reflect.spi.TypeInfo;
 
 /**
  * PropertyDispatchWrapper.
@@ -68,23 +69,27 @@
    public Object execute() throws Throwable
    {
       String name = property.getName();
+      PropertyInfo propertyInfo = BeanInfoUtil.getPropertyInfo(beanInfo, target, name);
+      TypeInfo typeInfo = propertyInfo.getType();
       if (nullify)
       {
-         try
+         if (typeInfo.isPrimitive() == false)
          {
-            beanInfo.setProperty(target, name, null);
+            try
+            {
+               beanInfo.setProperty(target, name, null);
+            }
+            catch (Throwable t)
+            {
+               if (log.isTraceEnabled())
+                  log.trace("Ignored for " + target + "." + name, t);
+            }
          }
-         catch (Throwable t)
-         {
-            if (log.isTraceEnabled())
-               log.trace("Ignored for " + target + "." + name, t);
-         }
       }
       else
       {
-         PropertyInfo propertyInfo = BeanInfoUtil.getPropertyInfo(beanInfo, target, name);
          ValueMetaData valueMetaData = property.getValue();
-         Object value = valueMetaData.getValue(propertyInfo.getType(), cl);
+         Object value = valueMetaData.getValue(typeInfo, cl);
          validatePropertyValue(context, target, propertyInfo, value);
          beanInfo.setProperty(target, name, value);
       }