[Jboss-cvs] JBossAS SVN: r56308 - projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins

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

Author: alesj
Date: 2006-08-27 04:28:38 -0400 (Sun, 27 Aug 2006)
New Revision: 56308

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractMapMetaData.java
Log:
Check if type value exists before iteration.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractMapMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractMapMetaData.java	2006-08-27 03:29:52 UTC (rev 56307)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractMapMetaData.java	2006-08-27 08:28:38 UTC (rev 56308)
@@ -190,18 +190,25 @@
 
    public Class getType(MetaDataVisitor visitor, MetaDataVisitorNode previous) throws Throwable
    {
-      for(MetaDataVisitorNode key : keySet())
+      // todo equality on cloned nodes
+      if (keyType != null)
       {
-         if (previous.equals(key) && keyType != null)
+         for(MetaDataVisitorNode key : keySet())
          {
-            return getClass(visitor, keyType);
+            if (previous.equals(key))
+            {
+               return getClass(visitor, keyType);
+            }
          }
       }
-      for(MetaDataVisitorNode v : values())
+      if (valueType != null)
       {
-         if (previous.equals(v) && valueType != null)
+         for(MetaDataVisitorNode v : values())
          {
-            return getClass(visitor, valueType);
+            if (previous.equals(v))
+            {
+               return getClass(visitor, valueType);
+            }
          }
       }
       return super.getType(visitor, previous);