hg: jdk8/tl/jdk: 8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.

[mike.duigou at oracle.com]

Changeset: f4129fcfacdc
Author:    mduigou
Date:      2013-10-23 14:32 -0700
URL:       http://hg.openjdk.java.net/jdk8/tl/jdk/rev/f4129fcfacdc

8024688: further split Map and ConcurrentMap defaults eliminating looping from Map defaults, Map.merge fixes and doc fixes.
Reviewed-by: psandoz, dholmes

! src/share/classes/java/util/HashMap.java
! src/share/classes/java/util/Map.java
! src/share/classes/java/util/concurrent/ConcurrentMap.java
! test/java/util/Map/Defaults.java