[crac] Integrated: Merge jdk:jdk-24+22

Dmitry Cherepanov dcherepanov at openjdk.org
Fri Jan 3 14:14:06 UTC 2025


On Fri, 3 Jan 2025 11:40:03 GMT, Dmitry Cherepanov <dcherepanov at openjdk.org> wrote:

> Merge jdk:jdk-24+22
> 
> Clean merge except src/java.base/share/classes/java/io/FileInputStream.java
> 
> - openjdk/crac changes https://github.com/openjdk/crac/commit/861df70be9ffab14a5e22b5e40108f5d3717c263
> - openjdk/jdk changes https://github.com/openjdk/jdk/commit/1341b81321fe77005ba68fba19c7d83e3fcb5fde
> 
> reapplied openjdk/jdk changes (added isRegularFile)

This pull request has now been integrated.

Changeset: 7b84c4e5
Author:    Dmitry Cherepanov <dcherepanov at openjdk.org>
Committer: Anton Kozlov <akozlov at openjdk.org>
URL:       https://git.openjdk.org/crac/commit/7b84c4e5d2b035df09f7002d789bd3294799cbd3
Stats:     166108 lines in 1348 files changed: 19132 ins; 143002 del; 3974 mod

Merge jdk:jdk-24+22

Reviewed-by: akozlov

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

PR: https://git.openjdk.org/crac/pull/170


More information about the crac-dev mailing list