Revert "Bratseth/allocation free hit field traversal"

1 files changed, 5 insertions, 1 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java
index 3e6e82a5584..97a5bdd72ca 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java
@@ -37,7 +37,11 @@ public class Organizer {
         sectionGroup.setQuery(result.hits().getQuery());
         if (errors!=null && errors instanceof DefaultErrorHit)
             sectionGroup.add((DefaultErrorHit)errors);
-        result.hits().forEachField((name, value) -> sectionGroup.setField(name, value));
+        for (Iterator<Map.Entry<String, Object>> it = result.hits().fieldIterator(); it.hasNext(); ) {
+            Map.Entry<String, Object> field = it.next();
+            sectionGroup.setField(field.getKey(), field.getValue());
+        }
+
         result.setHits(sectionGroup);
     }