Merge pull request #1247 from ruslansennov/hamt

LeafSingleton: compare hashCodes before checking equality #1243
vavr-io · Mar 30, 2016 · c0f695f · c0f695f
2 parents 30f89f1 + 9c2fbd2
commit c0f695f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/javaslang/src/main/java/javaslang/collection/HashArrayMappedTrie.java b/javaslang/src/main/java/javaslang/collection/HashArrayMappedTrie.java
@@ -287,7 +287,7 @@ final class LeafSingleton<K, V> extends LeafNode<K, V> implements Serializable {
 
         @Override
         Option<V> lookup(int shift, int keyHashCode, K key) {
-            if (Objects.equals(key, this.key)) {
+            if (keyHashCode == hash && Objects.equals(key, this.key)) {
                 return Option.some(value);
             } else {
                 return Option.none();
@@ -296,7 +296,7 @@ Option<V> lookup(int shift, int keyHashCode, K key) {
 
         @Override
         AbstractNode<K, V> modify(int shift, int keyHashCode, K key, V value, Action action) {
-            if (Objects.equals(key, this.key)) {
+            if (keyHashCode == hash && Objects.equals(key, this.key)) {
                 return (action == REMOVE) ? EmptyNode.instance() : new LeafSingleton<>(hash, key, value);
             } else {
                 return (action == REMOVE) ? this : mergeLeaves(shift, this, new LeafSingleton<>(keyHashCode, key, value));