svn commit: r1188961 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ContainUtil.java

[mcucchiara]

Author: mcucchiara
Date: Tue Oct 25 23:09:53 2011
New Revision: 1188961

URL: http://svn.apache.org/viewvc?rev=1188961&view=rev
Log:
Replaced while loop with foreach
Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ContainUtil.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ContainUtil.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ContainUtil.java?rev=1188961&r1=1188960&r2=1188961&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ContainUtil.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ContainUtil.java
 Tue Oct 25 23:09:53 2011
@@ -22,7 +22,6 @@
 package org.apache.struts2.util;
 
 import java.lang.reflect.Array;
-import java.util.Iterator;
 import java.util.Map;
 
 
@@ -81,13 +80,11 @@ public class ContainUtil {
                 return true;
             }
         } if (obj1 instanceof Iterable) {
-               Iterator iter = ((Iterable) obj1).iterator();
-               while(iter.hasNext()) {
-                       Object value = iter.next();
-                       if (obj2.equals(value) || 
obj2.toString().equals(value)) {
-                               return true;
-                       }
-               }
+            for (Object value : ((Iterable) obj1)) {
+                if (obj2.equals(value) || obj2.toString().equals(value)) {
+                    return true;
+                }
+            }
         } else if (obj1.getClass().isArray()) {
             for (int i = 0; i < Array.getLength(obj1); i++) {
                 Object value = null;