1 files changed, 2 insertions, 5 deletions
diff --git a/java/src/IceInternal/ObjectFactoryManager.java b/java/src/IceInternal/ObjectFactoryManager.java
index 1658816b588..c2cb3d7a7de 100644
--- a/java/src/IceInternal/ObjectFactoryManager.java
+++ b/java/src/IceInternal/ObjectFactoryManager.java
@@ -69,14 +69,11 @@ public final class ObjectFactoryManager
             _factoryMap = new java.util.HashMap<String, Ice.ObjectFactory>();
         }
 
-        java.util.Iterator<Ice.ObjectFactory> i = oldMap.values().iterator();
-        while(i.hasNext())
+        for(Ice.ObjectFactory factory : oldMap.values())
         {
-            Ice.ObjectFactory factory = i.next();
             factory.destroy();
         }
     }
 
-    private java.util.Map<String, Ice.ObjectFactory> _factoryMap =
-        new java.util.HashMap<String, Ice.ObjectFactory>();
+    private java.util.Map<String, Ice.ObjectFactory> _factoryMap = new java.util.HashMap<String, Ice.ObjectFactory>();
 }