Fixing ArrayMap hashCode to work with null values

mattwhisenhunt · Dec 11, 2017 · d2d73b1 · d2d73b1
1 parent 9578ae8
commit d2d73b1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/google-http-client/src/main/java/com/google/api/client/util/ArrayMap.java b/google-http-client/src/main/java/com/google/api/client/util/ArrayMap.java
@@ -416,7 +416,9 @@ public V setValue(V value) {
 
     @Override
     public int hashCode() {
-      return getKey().hashCode() ^ getValue().hashCode();
+      K key = getKey();
+      V value = getValue();
+      return (key != null ? key.hashCode() : 0) ^ (value != null ? value.hashCode() : 0);
     }
 
     @Override

diff --git a/google-http-client/src/test/java/com/google/api/client/util/ArrayMapTest.java b/google-http-client/src/test/java/com/google/api/client/util/ArrayMapTest.java
@@ -100,4 +100,13 @@ public void testSet() {
     } catch (IndexOutOfBoundsException e) {
     }
   }
+
+  public void testHashCode() {
+    ArrayMap<String, Integer> map = ArrayMap.of();
+    map.set(0, "a", null);
+    map.set(1, null, 1);
+    map.set(2, null, null);
+
+    assertTrue(map.hashCode() > 0);
+  }
 }