Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk

changeset 10221:8a59218a1ec2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8060485: (str) contentEquals checks the String contents twice on mismatch Reviewed-by: martin, chegar, alanb
author shade
date Tue, 14 Oct 2014 19:35:03 +0200
parents b6e5e04817c5
children 313dd4059170
files src/share/classes/java/lang/String.java
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/lang/String.java	Thu Oct 30 14:27:35 2014 -0700
+++ b/src/share/classes/java/lang/String.java	Tue Oct 14 19:35:03 2014 +0200
@@ -1045,8 +1045,9 @@
             }
         }
         // Argument is a String
-        if (cs.equals(this))
-            return true;
+        if (cs instanceof String) {
+            return equals(cs);
+        }
         // Argument is a generic CharSequence
         char v1[] = value;
         int n = v1.length;