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

[Severin Gehwolf]

On Thu, 24 Apr 2025 17:31:50 GMT, Severin Gehwolf <sgehwolf at openjdk.org> wrote:

> Please review this fix to [JDK-8353185](https://bugs.openjdk.org/browse/JDK-8353185). The reading logic for the config file would erroneously use `scanner.nextLine()` when the current line to be added is in `line`. `line` is not being added, but `scanner.nextLine()` unintentionally skipping lines. The config file has a change too. It moves the `tzdb.dat` line last so that the existing test verifies that the `cacerts` one isn't being skipped. This slipped through because `tzdb.dat` updates aren't automatically tested.
> 
> Testing:
> - [x] GHA
> - [x] The test from [JDK-8353185](https://bugs.openjdk.org/browse/JDK-8353185), `UpgradeableFileCacertsTest.java` fails with the config file change only (without the product fix) and passes with the one-liner. Also some manual testing when both files have been upgraded.
> 
> Thoughts?

This pull request has now been integrated.

Changeset: 89f9268e
Author:    Severin Gehwolf <sgehwolf at openjdk.org>
URL:       https://git.openjdk.org/jdk/commit/89f9268ed7c2cb86891f23a10482cd459454bd32
Stats:     3 lines in 2 files changed: 1 ins; 1 del; 1 mod

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

Reviewed-by: shade, alanb

-------------

PR: https://git.openjdk.org/jdk/pull/24855