archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8280881: (fs) UnixNativeDispatcher.close0 may throw UnixException

Browse source 
Reviewed-by: alanb
This commit is contained in:
Brian Burkhalter 2022-03-10 16:38:44 +00:00
parent 1668c02ee8
commit e8a1ce00b2
10 changed files with 67 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/java.base/unix/classes/sun/nio/fs/UnixCopyFile.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -186,7 +186,7 @@ class UnixCopyFile {
}
if (sfd >= 0) {
source.getFileSystem().copyNonPosixAttributes(sfd, dfd);
close(sfd);
close(sfd, e -> null);
}
}
// copy time stamps last
@ -210,7 +210,7 @@ class UnixCopyFile {
done = true;
} finally {
if (dfd >= 0)
close(dfd);
close(dfd, e -> null);
if (!done) {
// rollback
try { rmdir(target); } catch (UnixException ignore) { }
@ -288,7 +288,7 @@ class UnixCopyFile {
}
complete = true;
} finally {
close(fo);
close(fo, e -> null);
// copy of file or attributes failed so rollback
if (!complete) {
@ -298,7 +298,7 @@ class UnixCopyFile {
}
}
} finally {
close(fi);
close(fi, e -> null);
}
}