Skip to content

Fix how NullableConcurrentHashMap handles nulls in putAll method #466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
f2prateek merged 1 commit into from
Aug 31, 2016
Merged

Fix how NullableConcurrentHashMap handles nulls in putAll method #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions analytics-tests/src/test/java/com/segment/analytics/internal/UtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,24 @@ public class UtilsTest {
when(context.checkCallingOrSelfPermission(ACCESS_NETWORK_STATE)).thenReturn(PERMISSION_DENIED);
assertThat(isConnected(context)).isTrue();
}

@Test public void nullableConcurrentHashMapPutIgnoresNulls() throws Exception {
Map<String, String> map = new Utils.NullableConcurrentHashMap<>();
map.put(null, null);
map.put("foo", null);
map.put(null, "bar");

assertThat(map).isEmpty();
}

@Test public void nullableConcurrentHashMapPutAllIgnoresNulls() throws Exception {
Map<String, String> values = new LinkedHashMap<>();
values.put(null, null);
values.put("foo", null);
values.put(null, "bar");

Map<String, String> map = new Utils.NullableConcurrentHashMap<>();
map.putAll(values);
assertThat(map).isEmpty();
}
}
6 changes: 6 additions & 0 deletions analytics/src/main/java/com/segment/analytics/internal/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,5 +426,11 @@ public NullableConcurrentHashMap(Map<? extends K, ? extends V> m) {
}
return super.put(key, value);
}

@Override public void putAll(Map<? extends K, ? extends V> m) {
for (Map.Entry<? extends K, ? extends V> e : m.entrySet()) {
put(e.getKey(), e.getValue());
}
}
}
}