=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveValueAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveValueAction.java	2010-11-25 22:22:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveValueAction.java	2011-03-24 14:41:35 +0000
@@ -28,7 +28,6 @@
 
 import java.util.Collection;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.Set;
 
 import org.apache.commons.logging.Log;
@@ -219,15 +218,14 @@
         else
         {
             Set<DataElementCategoryOptionCombo> options = dataElement.getCategoryCombo().getOptionCombos();
-            if ( options != null && options.size() > 0 )
+            if ( options != null)
             {
-                Iterator<DataElementCategoryOptionCombo> i = options.iterator();
-                while ( i.hasNext() )
+                for ( DataElementCategoryOptionCombo tmpOption : options )
                 {
-                    DataElementCategoryOptionCombo tmpOption = i.next();
                     if ( tmpOption.getId() == optionComboId )
                     {
                         optionCombo = tmpOption;
+                        break;
                     }
                 }
             }