On 2026/05/19 5:51, Johan Corveleyn wrote: > On Tue, Dec 30, 2025 at 2:13 AM <[email protected]> wrote: >> >> Author: jun66j5 >> Date: Tue Dec 30 01:13:29 2025 >> New Revision: 1930973 >> >> Log: >> Fix test failures of JavaHL with Java 25 on Windows due to that deleting a >> file with readonly flag on Windows fails since Java 25. > > <snip> > >> Modified: >> subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java >> ============================================================================== >> --- >> subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java >> Mon Dec 29 19:39:34 2025 (r1930972) >> +++ >> subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java >> Tue Dec 30 01:13:29 2025 (r1930973) >> @@ -511,6 +515,18 @@ class SVNTests extends TestCase >> } >> } >> >> + // Unset readonly flag of the file because deleting a file with >> + // readonly flag on Windows fails since Java 25. >> + Path nioPath = path.toPath(); >> + FileStore store = Files.getFileStore(nioPath); >> + if (store.supportsFileAttributeView(DosFileAttributeView.class)) { >> + DosFileAttributeView view = Files.getFileAttributeView( >> + nioPath, DosFileAttributeView.class); >> + if (view != null) { >> + view.setReadOnly(false);; > > Not terribly important, but: double semi-colon > >> Modified: >> subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java >> ============================================================================== > ... >> + view.setReadOnly(false);; > > Here too > > This is nominated for backport to 1.15.x, so if you fix this, please > add it to the backport proposal too.
Thanks for the reviewing. Fixed in r1934367 and extended the proposal in 1.15.x with it in r1934368. -- Jun Omae <[email protected]> (大前 潤)
