src/share/classes/java/util/TreeMap.java

rev 7682 : 8021591: Additional explicit null checks
Reviewed-by: duke

*** 946,955 ****
--- 946,976 ----
      public SortedMap<K,V> tailMap(K fromKey) {
          return tailMap(fromKey, true);
      }
  
      @Override
+     public synchronized boolean replace(K key, V oldValue, V newValue) {
+         Entry<K,V> p = getEntry(key);
+         if (p!=null && Objects.equals(oldValue, p.value)) {
+             p.value = newValue;
+             return true;
+         }
+         return false;
+     }
+ 
+     @Override
+     public synchronized V replace(K key, V value) {
+         Entry<K,V> p = getEntry(key);
+         if (p!=null) {
+             V oldValue = p.value;
+             p.value = value;
+             return oldValue;
+         }
+         return null;
+     }
+ 
+     @Override
      public void forEach(BiConsumer<? super K, ? super V> action) {
          Objects.requireNonNull(action);
          int expectedModCount = modCount;
          for (Entry<K, V> e = getFirstEntry(); e != null; e = successor(e)) {
              action.accept(e.key, e.value);
*** 964,974 ****
      public void replaceAll(BiFunction<? super K, ? super V, ? extends V> function) {
          Objects.requireNonNull(function);
          int expectedModCount = modCount;
  
          for (Entry<K, V> e = getFirstEntry(); e != null; e = successor(e)) {
!             e.value = Objects.requireNonNull(function.apply(e.key, e.value));
  
              if (expectedModCount != modCount) {
                  throw new ConcurrentModificationException();
              }
          }
--- 985,995 ----
      public void replaceAll(BiFunction<? super K, ? super V, ? extends V> function) {
          Objects.requireNonNull(function);
          int expectedModCount = modCount;
  
          for (Entry<K, V> e = getFirstEntry(); e != null; e = successor(e)) {
!             e.value = function.apply(e.key, e.value);
  
              if (expectedModCount != modCount) {
                  throw new ConcurrentModificationException();
              }
          }