Merge pull request #21022 from JasonFengJ9/jdk25access

keithc-ca · web-flow · commit 7cf1352f9e67 · 2025-01-27T09:33:45.000-05:00
JDK25 removes JavaLangAccess.getCharsLatin1()/getCharsUTF16()
diff --git a/jcl/src/java.base/share/classes/java/lang/Access.java b/jcl/src/java.base/share/classes/java/lang/Access.java
@@ -551,6 +551,7 @@ public boolean addEnableNativeAccess(ModuleLayer moduleLayer, String moduleName)
 		return moduleLayer.addEnableNativeAccess(moduleName);
 	}
 
+	/*[IF JAVA_SPEC_VERSION < 25]*/
 	@Override
 	public int getCharsLatin1(long i, int index, byte[] buf) {
 		return StringLatin1.getChars(i, index, buf);
@@ -560,6 +561,7 @@ public int getCharsLatin1(long i, int index, byte[] buf) {
 	public int getCharsUTF16(long i, int index, byte[] buf) {
 		return StringUTF16.getChars(i, index, buf);
 	}
+	/*[ENDIF] JAVA_SPEC_VERSION < 25 */
 
 	@Override
 	public void putCharUTF16(byte[] val, int index, int c) {

Original file line number	Diff line number	Diff line change
`@@ -551,6 +551,7 @@ public boolean addEnableNativeAccess(ModuleLayer moduleLayer, String moduleName)`
`551`	`551`	`return moduleLayer.addEnableNativeAccess(moduleName);`
`552`	`552`	`}`
`553`	`553`
	`554`	`+ /[IF JAVA_SPEC_VERSION < 25]/`
`554`	`555`	`@Override`
`555`	`556`	`public int getCharsLatin1(long i, int index, byte[] buf) {`
`556`	`557`	`return StringLatin1.getChars(i, index, buf);`
`@@ -560,6 +561,7 @@ public int getCharsLatin1(long i, int index, byte[] buf) {`
`560`	`561`	`public int getCharsUTF16(long i, int index, byte[] buf) {`
`561`	`562`	`return StringUTF16.getChars(i, index, buf);`
`562`	`563`	`}`
	`564`	`+ /[ENDIF] JAVA_SPEC_VERSION < 25 /`
`563`	`565`
`564`	`566`	`@Override`
`565`	`567`	`public void putCharUTF16(byte[] val, int index, int c) {`