changeset 17739:b2af67961b70

8165393: bad merge in java/lang/ref/package-info.java Summary: Added the missing change. Reviewed-by: rriggs
author kbarrett
date Fri, 09 Sep 2016 16:24:24 -0400
parents b48fd6299b71
children 33f7b960dab0
files src/java.base/share/classes/java/lang/ref/package-info.java
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.base/share/classes/java/lang/ref/package-info.java	Fri Sep 09 12:07:49 2016 -0700
+++ b/src/java.base/share/classes/java/lang/ref/package-info.java	Fri Sep 09 16:24:24 2016 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -43,8 +43,7 @@
  * 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.
+ * scheduling post-mortem cleanup actions.
  * Post-mortem cleanup actions can be registered and managed by a
  * {@link java.lang.ref.Cleaner}.
  *