=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java	2015-09-30 04:01:49 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java	2015-09-30 04:06:58 +0000
@@ -611,20 +611,9 @@
     {
         trackedEntityInstanceStore.update( instance );
 
-        for ( TrackedEntityAttributeValue av : valuesForSave )
-        {
-            attributeValueService.addTrackedEntityAttributeValue( av );
-        }
-
-        for ( TrackedEntityAttributeValue av : valuesForUpdate )
-        {
-            attributeValueService.updateTrackedEntityAttributeValue( av );
-        }
-
-        for ( TrackedEntityAttributeValue av : valuesForDelete )
-        {
-            attributeValueService.deleteTrackedEntityAttributeValue( av );
-        }
+        valuesForSave.forEach( attributeValueService::addTrackedEntityAttributeValue );
+        valuesForUpdate.forEach( attributeValueService::updateTrackedEntityAttributeValue );
+        valuesForDelete.forEach( attributeValueService::deleteTrackedEntityAttributeValue );
 
         if ( shouldSaveRepresentativeInformation( instance, representativeId ) )
         {