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

Aleksey Shipilev shade at openjdk.org
Thu Apr 24 18:40:50 UTC 2025


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:
> - [ ] 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?

Ha! The bugfixes like these should be reserved for Friday evenings :)

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

Marked as reviewed by shade (Reviewer).

PR Review: https://git.openjdk.org/jdk/pull/24855#pullrequestreview-2792170097


More information about the core-libs-dev mailing list