From 7440989c09fae5325dbb3cebf0cf9d10f59dcbdd Mon Sep 17 00:00:00 2001
From: Alexander Pivovarov <apivovarov@gmail.com>
Date: Fri, 9 Sep 2016 23:10:12 -0700
Subject: [PATCH] [FLINK-4610] Replace keySet/getValue with entrySet in
 UdfAnalyzerUtils

---
 .../org/apache/flink/api/java/sca/UdfAnalyzerUtils.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java b/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java
index ca00d54921df2..a477a0322cd5a 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java
@@ -271,15 +271,15 @@ else if (resultMapping.containsKey(key)
 		}
 
 		// recursively merge contained mappings
-		Iterator<String> it = resultMapping.keySet().iterator();
+		Iterator<Map.Entry<String, TaggedValue>> it = resultMapping.entrySet().iterator();
 		while (it.hasNext()) {
-			String key = it.next();
-			TaggedValue value = mergeReturnValues(Collections.singletonList(resultMapping.get(key)));
+			Map.Entry<String, TaggedValue> entry = it.next();
+			TaggedValue value = mergeReturnValues(Collections.singletonList(entry.getValue()));
 			if (value == null) {
 				it.remove();
 			}
 			else {
-				resultMapping.put(key, value);
+				entry.setValue(value);
 			}
 		}