archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8254192: ExtraSharedClassListFile contains extra white space at end of line

Browse source 
Reviewed-by: iklam, ccheung, mchung
This commit is contained in:
Yumin Qi 2020-10-15 16:47:06 +00:00
parent f3ce45f2a1
commit 546620bb9e
2 changed files with 32 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/java.base/share/classes/jdk/internal/misc/CDS.java
View file

@ -141,14 +141,12 @@ public class CDS {
// Throw exception on invalid input
private static void validateInputLines(String[] lines) {
for (String s: lines) {
// There might be a trailing '\f' for line in ExtraClassListFile, do trim first.
String line = s.trim();
if (!line.startsWith("[LF_RESOLVE]") && !line.startsWith("[SPECIES_RESOLVE]")) {
throw new IllegalArgumentException("Wrong prefix: " + line);
if (!s.startsWith("[LF_RESOLVE]") && !s.startsWith("[SPECIES_RESOLVE]")) {
throw new IllegalArgumentException("Wrong prefix: " + s);
}
String[] parts = line.split(" ");
boolean isLF = line.startsWith("[LF_RESOLVE]");
String[] parts = s.split(" ");
boolean isLF = s.startsWith("[LF_RESOLVE]");
if (isLF) {
if (parts.length != 4) {
@ -176,7 +174,7 @@ public class CDS {
private static Object[] generateLambdaFormHolderClasses(String[] lines) {
Objects.requireNonNull(lines);
validateInputLines(lines);
Stream<String> lineStream = Arrays.stream(lines).map(String::trim);
Stream<String> lineStream = Arrays.stream(lines);
Map<String, byte[]> result = SharedSecrets.getJavaLangInvokeAccess().generateHolderClasses(lineStream);
int size = result.size();
Object[] retArray = new Object[size * 2];