src/share/classes/java/util/concurrent/ConcurrentMap.java

rev 8834 : 8029055: Map.merge and ConcurrentMap.merge @implSpec is not correct in case of non-existing key-value pair or a null value entry
Reviewed-by: duke

*** 471,482 ****
       * V oldValue = map.get(key);
       * V newValue = (oldValue == null) ? value :
       *              remappingFunction.apply(oldValue, value);
       * if (newValue == null)
       *     map.remove(key);
-      * else if (oldValue == null)
-      *     map.remove(key);
       * else
       *     map.put(key, newValue);
       * }</pre>
       *
       * <p>The default implementation may retry these steps when multiple
--- 471,480 ----