8355524: Only every second line in upgradeable files is being used

jerboaa · jerboaa · commit 57256de3db2e · 2025-05-06T14:21:00.000Z
Backport-of: 89f9268ed7c2cb86891f23a10482cd459454bd32
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/LinkableRuntimeImage.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/LinkableRuntimeImage.java
@@ -93,7 +93,7 @@ private static Set<String> upgradeableFiles(String module) {
                     // Skip comments
                     continue;
                 }
-                upgradeableFiles.add(scanner.nextLine());
+                upgradeableFiles.add(line);
             }
         } catch (IOException e) {
             throw new AssertionError("Failure to retrieve upgradeable files for " +
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/upgrade_files_java.base.conf b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/upgrade_files_java.base.conf
@@ -1,4 +1,4 @@
 # Configuration for resource paths of files allowed to be
 # upgraded (in java.base)
-lib/tzdb.dat
 lib/security/cacerts
+lib/tzdb.dat

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ private static Set<String> upgradeableFiles(String module) {`
`93`	`93`	`// Skip comments`
`94`	`94`	`continue;`
`95`	`95`	`}`
`96`		`- upgradeableFiles.add(scanner.nextLine());`
	`96`	`+ upgradeableFiles.add(line);`
`97`	`97`	`}`
`98`	`98`	`} catch (IOException e) {`
`99`	`99`	`throw new AssertionError("Failure to retrieve upgradeable files for " +`