[freenet-cvs] r19294 - trunk/freenet/src/freenet/node/fcp

[j16s...@freenetproject.org]

Author: j16sdiz
Date: 2008-04-14 03:13:14 +0000 (Mon, 14 Apr 2008)
New Revision: 19294

Modified:
   trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java
Log:
findbugs: inefficient use of keySet iternator


Modified: trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java  
2008-04-14 02:48:48 UTC (rev 19293)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java  
2008-04-14 03:13:14 UTC (rev 19294)
@@ -9,6 +9,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.Map;

 import freenet.client.async.ManifestElement;
 import freenet.node.Node;
@@ -151,10 +152,11 @@
         * HashMap's containing ManifestElement's.
         */
        private void convertFilesByNameToManifestElements(HashMap filesByName, 
HashMap manifestElements, Node node) throws MessageInvalidException {
-               Iterator i = filesByName.keySet().iterator();
+               Iterator i = filesByName.entrySet().iterator();
                while(i.hasNext()) {
-                       String tempName = (String) (i.next());
-                       Object val = filesByName.get(tempName);
+                       Map.Entry entry = (Map.Entry) i.next();
+                       String tempName = (String) entry.getKey();
+                       Object val = entry.getValue();
                        if(val instanceof HashMap) {
                                HashMap h = (HashMap) val;
                                HashMap manifests = new HashMap();