[jboss-cvs] JBossAS SVN: r65568 - projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types.

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

Author: scott.stark at jboss.org
Date: 2007-09-23 20:33:24 -0400 (Sun, 23 Sep 2007)
New Revision: 65568

Modified:
   projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ArrayMetaType.java
Log:
Handle an ArrayValue in isValue

Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ArrayMetaType.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ArrayMetaType.java	2007-09-23 20:55:45 UTC (rev 65567)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/ArrayMetaType.java	2007-09-24 00:33:24 UTC (rev 65568)
@@ -23,6 +23,8 @@
 
 import java.io.Serializable;
 
+import org.jboss.metatype.api.values.ArrayValue;
+
 /**
  * ArrayMetaType.
  *
@@ -302,7 +304,7 @@
          return false;
 
       Class clazz = obj.getClass();
-      if (clazz.isArray() == false)
+      if (clazz.isArray() == false && (obj instanceof ArrayValue) == false)
          return false;
       
       if (elementType instanceof SimpleMetaType)
@@ -310,6 +312,13 @@
       
       if (elementType instanceof TableMetaType || elementType instanceof CompositeMetaType)
       {
+         // If this is an ArrayValue check its MetaType
+         if (obj instanceof ArrayValue)
+         {
+            ArrayValue av = (ArrayValue) obj;
+            return this.equals(av.getMetaType());
+         }
+         // Check the element classes
          Class thisClass = null;
          try
          {