src/java.base/share/classes/java/util/concurrent/CompletableFuture.java |  119 +++---
 src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java |   34 +-
 test/jdk/java/util/concurrent/tck/ConcurrentHashMapTest.java            |    2 -
 test/jdk/java/util/concurrent/tck/ConcurrentSkipListMapTest.java        |    3 +-
 test/jdk/java/util/concurrent/tck/HashMapTest.java                      |    2 -
 test/jdk/java/util/concurrent/tck/HashtableTest.java                    |    2 -
 test/jdk/java/util/concurrent/tck/JSR166TestCase.java                   |    9 +-
 test/jdk/java/util/concurrent/tck/LinkedHashMapTest.java                |    2 -
 test/jdk/java/util/concurrent/tck/MapImplementation.java                |   10 +-
 test/jdk/java/util/concurrent/tck/MapTest.java                          |   73 +++-
 test/jdk/java/util/concurrent/tck/StampedLockTest.java                  |  185 +++++++--
 test/jdk/java/util/concurrent/tck/TreeMapTest.java                      |    2 -
 12 files changed, 312 insertions(+), 131 deletions(-)