A thin wrapper around a millisecond value that allows @@ -46,8 +44,6 @@ */ public class Date extends java.util.Date { - private static final JavaLangAccess jla = SharedSecrets.getJavaLangAccess(); - /** * Constructs a Date object initialized with the given * year, month, and day. @@ -168,7 +164,7 @@ buf[7] = '-'; Date.formatDecimalInt(day, buf, 8, 2); - return jla.newStringUnsafe(buf); + return new String(buf); } /** diff -r 390794d000e6 -r c4f2b6749c86 src/java.sql/share/classes/java/sql/Time.java --- a/src/java.sql/share/classes/java/sql/Time.java Tue Dec 05 14:10:11 2017 +0100 +++ b/src/java.sql/share/classes/java/sql/Time.java Tue Dec 05 14:25:16 2017 +0100 @@ -27,8 +27,6 @@ import java.time.Instant; import java.time.LocalTime; -import jdk.internal.misc.SharedSecrets; -import jdk.internal.misc.JavaLangAccess; /** *

A thin wrapper around the java.util.Date class that allows the JDBC @@ -43,8 +41,6 @@ */ public class Time extends java.util.Date { - private static final JavaLangAccess jla = SharedSecrets.getJavaLangAccess(); - /** * Constructs a Time object initialized with the * given values for the hour, minute, and second. @@ -134,7 +130,7 @@ buf[5] = ':'; Date.formatDecimalInt(second, buf, 6, 2); - return jla.newStringUnsafe(buf); + return new String(buf); } // Override all the date operations inherited from java.util.Date; diff -r 390794d000e6 -r c4f2b6749c86 src/java.sql/share/classes/java/sql/Timestamp.java --- a/src/java.sql/share/classes/java/sql/Timestamp.java Tue Dec 05 14:10:11 2017 +0100 +++ b/src/java.sql/share/classes/java/sql/Timestamp.java Tue Dec 05 14:25:16 2017 +0100 @@ -27,8 +27,6 @@ import java.time.Instant; import java.time.LocalDateTime; -import jdk.internal.misc.SharedSecrets; -import jdk.internal.misc.JavaLangAccess; /** *

A thin wrapper around {@code java.util.Date} that allows @@ -74,8 +72,6 @@ */ public class Timestamp extends java.util.Date { - private static final JavaLangAccess jla = SharedSecrets.getJavaLangAccess(); - /** * Constructs a {@code Timestamp} object initialized * with the given values. @@ -313,7 +309,7 @@ buf[yearSize + 15] = '.'; Date.formatDecimalInt(tmpNanos, buf, yearSize + 16, 9 - trailingZeros); - return jla.newStringUnsafe(buf); + return new String(buf); } /** diff -r 390794d000e6 -r c4f2b6749c86 test/jdk/ProblemList.txt --- a/test/jdk/ProblemList.txt Tue Dec 05 14:10:11 2017 +0100 +++ b/test/jdk/ProblemList.txt Tue Dec 05 14:25:16 2017 +0100 @@ -124,8 +124,6 @@ java/lang/StringCoding/CheckEncodings.sh 7008363 generic-all -jdk/internal/misc/JavaLangAccess/NewUnsafeString.java 8176188 generic-all - java/lang/String/nativeEncoding/StringPlatformChars.java 8182569 windows-all,solaris-all ############################################################################ diff -r 390794d000e6 -r c4f2b6749c86 test/jdk/jdk/internal/misc/JavaLangAccess/NewUnsafeString.java --- a/test/jdk/jdk/internal/misc/JavaLangAccess/NewUnsafeString.java Tue Dec 05 14:10:11 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,88 +0,0 @@ -/* - * Copyright (c) 2012, 2017, 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. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -import java.util.Objects; -import java.util.Comparator; -import jdk.internal.misc.JavaLangAccess; -import jdk.internal.misc.SharedSecrets; - -/* - * @test - * @bug 8013528 - * @summary Test JavaLangAccess.newUnsafeString - * @modules java.base/jdk.internal.misc - * @compile -XDignore.symbol.file NewUnsafeString.java - * @run main NewUnsafeString - */ -public class NewUnsafeString { - - static final JavaLangAccess jla = SharedSecrets.getJavaLangAccess(); - - public static void testNewUnsafeString() { - String benchmark = "exemplar"; - String constructorCopy = new String(benchmark); - char[] jlaChars = benchmark.toCharArray(); - String jlaCopy = jla.newStringUnsafe(jlaChars); - - if (benchmark == constructorCopy) { - throw new Error("should be different instances"); - } - if (!benchmark.equals(constructorCopy)) { - throw new Error("Copy not equal"); - } - if (0 != Objects.compare(benchmark, constructorCopy, Comparator.naturalOrder())) { - throw new Error("Copy not equal"); - } - - if (benchmark == jlaCopy) { - throw new Error("should be different instances"); - } - if (!benchmark.equals(jlaCopy)) { - throw new Error("Copy not equal"); - } - if (0 != Objects.compare(benchmark, jlaCopy, Comparator.naturalOrder())) { - throw new Error("Copy not equal"); - } - - if (constructorCopy == jlaCopy) { - throw new Error("should be different instances"); - } - if (!constructorCopy.equals(jlaCopy)) { - throw new Error("Copy not equal"); - } - if (0 != Objects.compare(constructorCopy, jlaCopy, Comparator.naturalOrder())) { - throw new Error("Copy not equal"); - } - - // The following is extremely "evil". Never ever do this in non-test code. - jlaChars[0] = 'X'; - if (!"Xxemplar".equals(jlaCopy)) { - throw new Error("jla.newStringUnsafe did not use provided string"); - } - - } - - public static void main(String[] args) { - testNewUnsafeString(); - } -}