--- jsr166/src/jsr166e/ConcurrentHashMapV8.java 2013/02/11 17:35:59 1.95 +++ jsr166/src/jsr166e/ConcurrentHashMapV8.java 2013/02/11 20:52:00 1.98 @@ -4756,8 +4756,6 @@ public class ConcurrentHashMapV8 V v; if ((v = value) == null) throw new UnsupportedOperationException(); - if (e == null) - throw new NullPointerException(); return map.internalPut(e, v, true) == null; } public boolean addAll(Collection c) { @@ -4766,8 +4764,6 @@ public class ConcurrentHashMapV8 if ((v = value) == null) throw new UnsupportedOperationException(); for (K e : c) { - if (e == null) - throw new NullPointerException(); if (map.internalPut(e, v, true) == null) added = true; } @@ -4784,7 +4780,7 @@ public class ConcurrentHashMapV8 /** * A view of a ConcurrentHashMapV8 as a {@link Collection} of * values, in which additions are disabled. This class cannot be - * directly instantiated. See {@link #values}, + * directly instantiated. See {@link #values()}. * *

The view's {@code iterator} is a "weakly consistent" iterator * that will never throw {@link ConcurrentModificationException}, @@ -4870,11 +4866,7 @@ public class ConcurrentHashMapV8 } public final boolean add(Entry e) { - K key = e.getKey(); - V value = e.getValue(); - if (key == null || value == null) - throw new NullPointerException(); - return map.internalPut(key, value, false) == null; + return map.internalPut(e.getKey(), e.getValue(), false) == null; } public final boolean addAll(Collection> c) { boolean added = false;