src/java.base/share/classes/java/lang/ref/package-info.java

rev 15569 : [mq]: fix_bad_merge

*** 1,7 ****
  /*
!  * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 41,52 ****
   * and <em>phantom</em>.  Each type corresponds to a different level
   * of reachability, as defined below.  Soft references are for
   * implementing memory-sensitive caches, weak references are for
   * implementing canonicalizing mappings that do not prevent their keys
   * (or values) from being reclaimed, and phantom references are for
!  * scheduling pre-mortem cleanup actions in a more flexible way than
!  * is possible with the Java finalization mechanism.
   * Post-mortem cleanup actions can be registered and managed by a
   * {@link java.lang.ref.Cleaner}.
   *
   * <p> Each reference-object type is implemented by a subclass of the
   * abstract base {@link java.lang.ref.Reference} class.
--- 41,51 ----
   * and <em>phantom</em>.  Each type corresponds to a different level
   * of reachability, as defined below.  Soft references are for
   * implementing memory-sensitive caches, weak references are for
   * implementing canonicalizing mappings that do not prevent their keys
   * (or values) from being reclaimed, and phantom references are for
!  * scheduling post-mortem cleanup actions.
   * Post-mortem cleanup actions can be registered and managed by a
   * {@link java.lang.ref.Cleaner}.
   *
   * <p> Each reference-object type is implemented by a subclass of the
   * abstract base {@link java.lang.ref.Reference} class.