infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-30 09:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge error

Browse Source
This commit is contained in:
Shaojin Wen 2025-12-24 16:58:23 +08:00
parent bcb7d4be6d
commit 9d2e6269a9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java.base/share/classes/java/lang/Integer.java
View File

@ -293,14 +293,14 @@ public final class Integer extends Number
chars[--len] = (byte) x;
x >>>= 8;
} while (len > 0);
return new String(chars, LATIN1);
return new String(chars, String.LATIN1);
} else {
byte[] chars = new byte[len << 1];
do {
StringUTF16.putChar(chars, --len, (byte) x);
x >>>= 8;
} while (len > 0);
return new String(chars, UTF16);
return new String(chars, String.UTF16);
}
}

6
src/java.base/share/classes/java/lang/Long.java
View File

@ -315,14 +315,14 @@ public final class Long extends Number
byte[] chars = new byte[len];
if (len > 8) {
len -= 8;
Unsafe.getUnsafe().putLongUnaligned(chars, ARRAY_BYTE_BASE_OFFSET + len, x, true);
Unsafe.getUnsafe().putLongUnaligned(chars, Unsafe.ARRAY_BYTE_BASE_OFFSET + len, x, true);
x = HexDigits.hex8(i >>> 32);
}
do {
chars[--len] = (byte) x;
x >>>= 8;
} while (len > 0);
return new String(chars, LATIN1);
return new String(chars, String.LATIN1);
} else {
byte[] chars = new byte[len << 1];
byte b;
@ -338,7 +338,7 @@ public final class Long extends Number
StringUTF16.putChar(chars, --len, (byte) x);
x >>>= 8;
} while (len > 0);
return new String(chars, UTF16);
return new String(chars, String.UTF16);
}
}