--- jsr166/src/jsr166e/LongAdderTable.java	2011/09/10 01:38:28	1.5
+++ jsr166/src/jsr166e/LongAdderTable.java	2011/10/02 22:01:06	1.7
@@ -53,13 +53,7 @@ public class LongAdderTable<K> implement
      * @return the adder associated with the key
      */
     public LongAdder install(K key) {
-        LongAdder a = map.get(key);
-        if (a == null) {
-            LongAdder r = new LongAdder();
-            if ((a = map.putIfAbsent(key, r)) == null)
-                a = r;
-        }
-        return a;
+        return map.computeIfAbsent(key, createAdder);
     }
 
     /**
@@ -71,10 +65,7 @@ public class LongAdderTable<K> implement
      * @param x the value to add
      */
     public void add(K key, long x) {
-        LongAdder a = map.get(key);
-        if (a == null)
-            a = map.computeIfAbsent(key, createAdder);
-        a.add(x);
+        map.computeIfAbsent(key, createAdder).add(x);
     }
 
     /**
@@ -136,7 +127,7 @@ public class LongAdderTable<K> implement
     /**
      * Returns the sum totalled across all keys.
      *
-     * @return the sum totalled across all keys.
+     * @return the sum totalled across all keys
      */
     public long sumAll() {
         long sum = 0L;
@@ -156,7 +147,7 @@ public class LongAdderTable<K> implement
     /**
      * Totals, then resets, the sums associated with all keys.
      *
-     * @return the sum totalled across all keys.
+     * @return the sum totalled across all keys
      */
     public long sumThenResetAll() {
         long sum = 0L;