--- jsr166/src/jsr166e/ConcurrentHashMapV8.java	2013/01/22 20:17:55	1.90
+++ jsr166/src/jsr166e/ConcurrentHashMapV8.java	2013/02/11 20:43:59	1.97
@@ -1977,7 +1977,7 @@ public class ConcurrentHashMapV8<K, V>
         }
     }
 
-    /*
+    /**
      * Moves and/or copies the nodes in each bin to new table. See
      * above for explanation.
      */
@@ -2894,8 +2894,7 @@ public class ConcurrentHashMapV8<K, V>
      * course only appropriate if it is acceptable to use the same
      * value for all additions from this view.
      *
-     * @param mappedValue the mapped value to use for any
-     * additions.
+     * @param mappedValue the mapped value to use for any additions
      * @return the set view
      * @throws NullPointerException if the mappedValue is null
      */
@@ -3373,8 +3372,8 @@ public class ConcurrentHashMapV8<K, V>
      * of each (key, value).
      *
      * @param transformer a function returning the transformation
-     * for an element, or null of there is no transformation (in
-     * which case the action is not applied).
+     * for an element, or null if there is no transformation (in
+     * which case the action is not applied)
      * @param action the action
      */
     @SuppressWarnings("unchecked") public <U> void forEachSequentially
@@ -3417,8 +3416,8 @@ public class ConcurrentHashMapV8<K, V>
      * combine values, or null if none.
      *
      * @param transformer a function returning the transformation
-     * for an element, or null of there is no transformation (in
-     * which case it is not combined).
+     * for an element, or null if there is no transformation (in
+     * which case it is not combined)
      * @param reducer a commutative associative combining function
      * @return the result of accumulating the given transformation
      * of all (key, value) pairs
@@ -3530,8 +3529,8 @@ public class ConcurrentHashMapV8<K, V>
      * of each key.
      *
      * @param transformer a function returning the transformation
-     * for an element, or null of there is no transformation (in
-     * which case the action is not applied).
+     * for an element, or null if there is no transformation (in
+     * which case the action is not applied)
      * @param action the action
      */
     @SuppressWarnings("unchecked") public <U> void forEachKeySequentially
@@ -3595,8 +3594,8 @@ public class ConcurrentHashMapV8<K, V>
      * null if none.
      *
      * @param transformer a function returning the transformation
-     * for an element, or null of there is no transformation (in
-     * which case it is not combined).
+     * for an element, or null if there is no transformation (in
+     * which case it is not combined)
      * @param reducer a commutative associative combining function
      * @return the result of accumulating the given transformation
      * of all keys
@@ -3708,8 +3707,8 @@ public class ConcurrentHashMapV8<K, V>
      * of each value.
      *
      * @param transformer a function returning the transformation
-     * for an element, or null of there is no transformation (in
-     * which case the action is not applied).
+     * for an element, or null if there is no transformation (in
+     * which case the action is not applied)
      */
     public <U> void forEachValueSequentially
         (Fun<? super V, ? extends U> transformer,
@@ -3768,8 +3767,8 @@ public class ConcurrentHashMapV8<K, V>
      * null if none.
      *
      * @param transformer a function returning the transformation
-     * for an element, or null of there is no transformation (in
-     * which case it is not combined).
+     * for an element, or null if there is no transformation (in
+     * which case it is not combined)
      * @param reducer a commutative associative combining function
      * @return the result of accumulating the given transformation
      * of all values
@@ -3882,8 +3881,8 @@ public class ConcurrentHashMapV8<K, V>
      * of each entry.
      *
      * @param transformer a function returning the transformation
-     * for an element, or null of there is no transformation (in
-     * which case the action is not applied).
+     * for an element, or null if there is no transformation (in
+     * which case the action is not applied)
      * @param action the action
      */
     @SuppressWarnings("unchecked") public <U> void forEachEntrySequentially
@@ -3945,8 +3944,8 @@ public class ConcurrentHashMapV8<K, V>
      * or null if none.
      *
      * @param transformer a function returning the transformation
-     * for an element, or null of there is no transformation (in
-     * which case it is not combined).
+     * for an element, or null if there is no transformation (in
+     * which case it is not combined)
      * @param reducer a commutative associative combining function
      * @return the result of accumulating the given transformation
      * of all entries
@@ -4057,8 +4056,8 @@ public class ConcurrentHashMapV8<K, V>
      * of each (key, value).
      *
      * @param transformer a function returning the transformation
-     * for an element, or null of there is no transformation (in
-     * which case the action is not applied).
+     * for an element, or null if there is no transformation (in
+     * which case the action is not applied)
      * @param action the action
      */
     public <U> void forEachInParallel
@@ -4092,8 +4091,8 @@ public class ConcurrentHashMapV8<K, V>
      * combine values, or null if none.
      *
      * @param transformer a function returning the transformation
-     * for an element, or null of there is no transformation (in
-     * which case it is not combined).
+     * for an element, or null if there is no transformation (in
+     * which case it is not combined)
      * @param reducer a commutative associative combining function
      * @return the result of accumulating the given transformation
      * of all (key, value) pairs
@@ -4180,8 +4179,8 @@ public class ConcurrentHashMapV8<K, V>
      * of each key.
      *
      * @param transformer a function returning the transformation
-     * for an element, or null of there is no transformation (in
-     * which case the action is not applied).
+     * for an element, or null if there is no transformation (in
+     * which case the action is not applied)
      * @param action the action
      */
     public <U> void forEachKeyInParallel
@@ -4229,8 +4228,8 @@ public class ConcurrentHashMapV8<K, V>
      * null if none.
      *
      * @param transformer a function returning the transformation
-     * for an element, or null of there is no transformation (in
-     * which case it is not combined).
+     * for an element, or null if there is no transformation (in
+     * which case it is not combined)
      * @param reducer a commutative associative combining function
      * @return the result of accumulating the given transformation
      * of all keys
@@ -4317,8 +4316,8 @@ public class ConcurrentHashMapV8<K, V>
      * of each value.
      *
      * @param transformer a function returning the transformation
-     * for an element, or null of there is no transformation (in
-     * which case the action is not applied).
+     * for an element, or null if there is no transformation (in
+     * which case the action is not applied)
      */
     public <U> void forEachValueInParallel
         (Fun<? super V, ? extends U> transformer,
@@ -4364,8 +4363,8 @@ public class ConcurrentHashMapV8<K, V>
      * null if none.
      *
      * @param transformer a function returning the transformation
-     * for an element, or null of there is no transformation (in
-     * which case it is not combined).
+     * for an element, or null if there is no transformation (in
+     * which case it is not combined)
      * @param reducer a commutative associative combining function
      * @return the result of accumulating the given transformation
      * of all values
@@ -4452,8 +4451,8 @@ public class ConcurrentHashMapV8<K, V>
      * of each entry.
      *
      * @param transformer a function returning the transformation
-     * for an element, or null of there is no transformation (in
-     * which case the action is not applied).
+     * for an element, or null if there is no transformation (in
+     * which case the action is not applied)
      * @param action the action
      */
     public <U> void forEachEntryInParallel
@@ -4500,8 +4499,8 @@ public class ConcurrentHashMapV8<K, V>
      * or null if none.
      *
      * @param transformer a function returning the transformation
-     * for an element, or null of there is no transformation (in
-     * which case it is not combined).
+     * for an element, or null if there is no transformation (in
+     * which case it is not combined)
      * @param reducer a commutative associative combining function
      * @return the result of accumulating the given transformation
      * of all entries
@@ -4716,7 +4715,7 @@ public class ConcurrentHashMapV8<K, V>
      * A view of a ConcurrentHashMapV8 as a {@link Set} of keys, in
      * which additions may optionally be enabled by mapping to a
      * common value.  This class cannot be directly instantiated. See
-     * {@link #keySet}, {@link #keySet(Object)}, {@link #newKeySet()},
+     * {@link #keySet()}, {@link #keySet(Object)}, {@link #newKeySet()},
      * {@link #newKeySet(int)}.
      */
     public static class KeySetView<K,V> extends CHMView<K,V>
@@ -4733,7 +4732,7 @@ public class ConcurrentHashMapV8<K, V>
          * or {@code null} if additions are not supported.
          *
          * @return the default mapped value for additions, or {@code null}
-         * if not supported.
+         * if not supported
          */
         public V getMappedValue() { return value; }
 
@@ -4785,7 +4784,7 @@ public class ConcurrentHashMapV8<K, V>
     /**
      * 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()}.
      *
      * <p>The view's {@code iterator} is a "weakly consistent" iterator
      * that will never throw {@link ConcurrentModificationException},
@@ -4835,7 +4834,7 @@ public class ConcurrentHashMapV8<K, V>
     /**
      * A view of a ConcurrentHashMapV8 as a {@link Set} of (key, value)
      * entries.  This class cannot be directly instantiated. See
-     * {@link #entrySet}.
+     * {@link #entrySet()}.
      */
     public static final class EntrySetView<K,V> extends CHMView<K,V>
         implements Set<Map.Entry<K,V>> {
@@ -4871,11 +4870,7 @@ public class ConcurrentHashMapV8<K, V>
         }
 
         public final boolean add(Entry<K,V> 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<? extends Entry<K,V>> c) {
             boolean added = false;
@@ -4972,7 +4967,7 @@ public class ConcurrentHashMapV8<K, V>
          * @param map the map
          * @param transformer a function returning the transformation
          * for an element, or null if there is no transformation (in
-         * which case it is not combined).
+         * which case it is not combined)
          * @param reducer a commutative associative combining function
          * @return the task
          */
@@ -5139,7 +5134,7 @@ public class ConcurrentHashMapV8<K, V>
          * @param map the map
          * @param transformer a function returning the transformation
          * for an element, or null if there is no transformation (in
-         * which case it is not combined).
+         * which case it is not combined)
          * @param reducer a commutative associative combining function
          * @return the task
          */
@@ -5305,7 +5300,7 @@ public class ConcurrentHashMapV8<K, V>
          * @param map the map
          * @param transformer a function returning the transformation
          * for an element, or null if there is no transformation (in
-         * which case it is not combined).
+         * which case it is not combined)
          * @param reducer a commutative associative combining function
          * @return the task
          */
@@ -5471,7 +5466,7 @@ public class ConcurrentHashMapV8<K, V>
          * @param map the map
          * @param transformer a function returning the transformation
          * for an element, or null if there is no transformation (in
-         * which case it is not combined).
+         * which case it is not combined)
          * @param reducer a commutative associative combining function
          * @return the task
          */