[jboss-cvs] JBossAS SVN: r81357 - projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values.

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

Author: alesj
Date: 2008-11-20 06:45:01 -0500 (Thu, 20 Nov 2008)
New Revision: 81357

Modified:
   projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java
Log:
Optimize this a bit.

Modified: projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java
===================================================================
--- projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java	2008-11-20 11:28:42 UTC (rev 81356)
+++ projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java	2008-11-20 11:45:01 UTC (rev 81357)
@@ -760,15 +760,14 @@
          }
          ClassInfo classInfo = collectionInfo.getClassInfo();
          Collection collection = (Collection)createNewInstance(collectionInfo);
-         Iterator<MetaValue> iter = collectionValue.iterator();
-         while (iter.hasNext())
+
+         TypeInfo componentType = classInfo.getComponentType();
+         boolean isObjectTypeInfo = OBJECT_TYPE_INFO.equals(componentType);
+
+         for (MetaValue metaValue : collectionValue)
          {
-            MetaValue metaValue = iter.next();
-            TypeInfo componentType = classInfo.getComponentType();
-            // try better
-            if (OBJECT_TYPE_INFO.equals(componentType))
-               componentType = getTypeInfo(metaValue.getMetaType(), null);
-            collection.add(unwrap(metaValue, componentType));
+            TypeInfo iterTypeInfo = isObjectTypeInfo ? getTypeInfo(metaValue.getMetaType(), null) : componentType;
+            collection.add(unwrap(metaValue, iterTypeInfo));
          }
          return collection;
       }