Minor clean-ups: replace new HashSet + add with copy constructor and …

…inline it variable.
voldemort · Apr 5, 2009 · b8acff0 · b8acff0
1 parent 8c08e26
commit b8acff0
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/java/voldemort/store/routed/ReadRepairer.java b/src/java/voldemort/store/routed/ReadRepairer.java
@@ -19,7 +19,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -104,8 +103,7 @@ public List<NodeValue<K, V>> getRepairs(List<NodeValue<K, V>> nodeValues) {
         for(Integer id: obsolete) {
             // repair all obsolete nodes
             for(Version v: concurrents.keySet()) {
-                Iterator<NodeValue<K, V>> it = concurrents.get(v).iterator();
+                NodeValue<K, V> concurrent = concurrents.get(v).iterator().next();
-                NodeValue<K, V> concurrent = it.next();
                 NodeValue<K, V> repair = new NodeValue<K, V>(id,
                                                              concurrent.getKey(),
                                                              concurrent.getVersioned());
@@ -117,9 +115,7 @@ public List<NodeValue<K, V>> getRepairs(List<NodeValue<K, V>> nodeValues) {
             // if there are more then one concurrent versions on different
             // nodes,
             // we should repair so all have the same set of values
-            HashSet<NodeValue<K, V>> existing = new HashSet<NodeValue<K, V>>();
+            Set<NodeValue<K, V>> existing = new HashSet<NodeValue<K, V>>(repairs);
-            for(NodeValue<K, V> value: repairs)
-                existing.add(value);
             for(NodeValue<K, V> entry1: concurrents.values()) {
                 for(NodeValue<K, V> entry2: concurrents.values()) {
                     if(!entry1.getVersion().equals(entry2.getVersion())) {