WIP

Signed-off-by: Dave Streeter <dave.streeter@lexisnexisrisk.com>

Author: streeterd

ecl/eclagent/eclagent.cpp

@@ -690,15 +690,13 @@ void EclAgent::deleteTempFiles()
 
     if (!tempOwnerId.isEmpty())
     {
-        Owned<HashIterator> iter = new HashIterator(tempFileInfoMap);
-        for (iter->first(); iter->isValid(); iter->next())
+        HashIterator it(tempFileInfoMap);
+        ForEach(it)
         {
-            CTempFileInfo *tempFileInfo = tempFileInfoMap.mapToValue(&iter->query());
-            if (!tempFileInfo)
-                continue;
-
-            const char *key = static_cast<const char *>(iter->query().getKey());
-            removeTemporaryFile(key);
+            const char *originalId = static_cast<const char *>(it.query().getKey());
+            CTempFileInfo *tempFileInfo = tempFileInfoMap.getValue(originalId);
+            if (tempFileInfo)
+                removeTemporaryFile(originalId);
         }
     }
 }