# HG changeset patch
# User redestad
# Date 1544785359 -3600
# Node ID c74f074c532a2df83f733e6aa4982187421e0dc3
# Parent  74c8a506d23a78157d6a60ec4e72e88b4b035b6d
8215380: Backout accidental change to String::length
Reviewed-by: darcy, smarks

diff -r 74c8a506d23a -r c74f074c532a src/java.base/share/classes/java/lang/String.java
--- a/src/java.base/share/classes/java/lang/String.java	Fri Dec 14 06:39:14 2018 +0100
+++ b/src/java.base/share/classes/java/lang/String.java	Fri Dec 14 12:02:39 2018 +0100
@@ -664,7 +664,7 @@
      *          object.
      */
     public int length() {
-        return isLatin1() ? value.length : value.length >> UTF16;
+        return value.length >> coder();
     }
 
     /**