Revert "[#37] toSet() parallel optimization implementation"

This reverts commit 596cf9c.
amaembo · Dec 12, 2015 · c39e547 · c39e547
1 parent 596cf9c
commit c39e547
Showing 1 changed file with 1 addition and 24 deletions.
diff --git a/src/main/java/one/util/streamex/AbstractStreamEx.java b/src/main/java/one/util/streamex/AbstractStreamEx.java
@@ -18,7 +18,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -28,8 +27,6 @@
 import java.util.Set;
 import java.util.Spliterator;
 import java.util.Spliterators.AbstractSpliterator;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.BinaryOperator;
@@ -1114,27 +1111,7 @@ public <R> R toListAndThen(Function<List<T>, R> finisher) {
      * @see Collectors#toSet()
      */
     public Set<T> toSet() {
-        if(isParallel()) {
-            AtomicBoolean hasNull = new AtomicBoolean();
-            Set<T> set = ConcurrentHashMap.newKeySet();
-            forEach(val -> {
-                if(val == null)
-                    hasNull.set(true);
-                else
-                    set.add(val);
-            });
-            if(hasNull.get()) {
-                Set<T> result = new HashSet<>(set);
-                result.add(null);
-                return result;
-            } else {
-                return set;
-            }
-        } else {
-            Set<T> result = new HashSet<>();
-            forEach(result::add);
-            return result;
-        }
+        return rawCollect(Collectors.toSet());
     }
 
     /**