[jboss-cvs] JBossAS SVN: r66181 - projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins.

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

Author: alesj
Date: 2007-10-16 10:49:33 -0400 (Tue, 16 Oct 2007)
New Revision: 66181

Modified:
   projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/WritethroughManagedPropertyImpl.java
Log:
Fix NPE --> allow setValue null.

Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/WritethroughManagedPropertyImpl.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/WritethroughManagedPropertyImpl.java	2007-10-16 14:40:47 UTC (rev 66180)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/WritethroughManagedPropertyImpl.java	2007-10-16 14:49:33 UTC (rev 66181)
@@ -105,9 +105,18 @@
             else
                metaValue = (MetaValue)value;
 
-            MetaType metaType = metaValue.getMetaType();
-            if (metaType.isTable() == false && metaType.isComposite() == false)
+            boolean setValue;
+            if (metaValue == null)
             {
+               setValue = true;
+            }
+            else
+            {
+               MetaType metaType = metaValue.getMetaType();
+               setValue = (metaType.isTable() == false && metaType.isComposite() == false);
+            }
+            if (setValue)
+            {
                InstanceClassFactory icf = getObjectFactory().getInstanceClassFactory(attachment.getClass());
                BeanInfo beanInfo = propertyInfo.getBeanInfo();
                icf.setValue(beanInfo, this, attachment, metaValue);