--- jsr166/src/jsr166e/ConcurrentHashMapV8.java 2013/01/19 20:39:43 1.89 +++ jsr166/src/jsr166e/ConcurrentHashMapV8.java 2013/01/28 06:58:51 1.91 @@ -1785,8 +1785,10 @@ public class ConcurrentHashMapV8 } } if (len != 0) { - if (len > 1) + if (len > 1) { addCount(delta, len); + delta = 0L; + } break; } } @@ -3371,7 +3373,7 @@ public class ConcurrentHashMapV8 * of each (key, value). * * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in + * for an element, or null if there is no transformation (in * which case the action is not applied). * @param action the action */ @@ -3415,7 +3417,7 @@ public class ConcurrentHashMapV8 * combine values, or null if none. * * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in + * 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 @@ -3528,7 +3530,7 @@ public class ConcurrentHashMapV8 * of each key. * * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in + * for an element, or null if there is no transformation (in * which case the action is not applied). * @param action the action */ @@ -3593,7 +3595,7 @@ public class ConcurrentHashMapV8 * null if none. * * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in + * 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 @@ -3706,7 +3708,7 @@ public class ConcurrentHashMapV8 * of each value. * * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in + * for an element, or null if there is no transformation (in * which case the action is not applied). */ public void forEachValueSequentially @@ -3766,7 +3768,7 @@ public class ConcurrentHashMapV8 * null if none. * * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in + * 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 @@ -3880,7 +3882,7 @@ public class ConcurrentHashMapV8 * of each entry. * * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in + * for an element, or null if there is no transformation (in * which case the action is not applied). * @param action the action */ @@ -3943,7 +3945,7 @@ public class ConcurrentHashMapV8 * or null if none. * * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in + * 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 @@ -4055,7 +4057,7 @@ public class ConcurrentHashMapV8 * of each (key, value). * * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in + * for an element, or null if there is no transformation (in * which case the action is not applied). * @param action the action */ @@ -4090,7 +4092,7 @@ public class ConcurrentHashMapV8 * combine values, or null if none. * * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in + * 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 @@ -4178,7 +4180,7 @@ public class ConcurrentHashMapV8 * of each key. * * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in + * for an element, or null if there is no transformation (in * which case the action is not applied). * @param action the action */ @@ -4227,7 +4229,7 @@ public class ConcurrentHashMapV8 * null if none. * * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in + * 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 @@ -4315,7 +4317,7 @@ public class ConcurrentHashMapV8 * of each value. * * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in + * for an element, or null if there is no transformation (in * which case the action is not applied). */ public void forEachValueInParallel @@ -4362,7 +4364,7 @@ public class ConcurrentHashMapV8 * null if none. * * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in + * 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 @@ -4450,7 +4452,7 @@ public class ConcurrentHashMapV8 * of each entry. * * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in + * for an element, or null if there is no transformation (in * which case the action is not applied). * @param action the action */ @@ -4498,7 +4500,7 @@ public class ConcurrentHashMapV8 * or null if none. * * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in + * 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