1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8211859: Avoid initializing AtomicBoolean from RandomAccessFile

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Claes Redestad 2018-10-09 14:30:06 +02:00
parent 1ac444ad87
commit 02a3be9920
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/java.base/share/classes/java/io/RandomAccessFile.java
View File

@ -71,7 +71,9 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
*/
private final String path;
private final AtomicBoolean closed = new AtomicBoolean(false);
private final Object closeLock = new Object();
private volatile boolean closed;
private static final int O_RDONLY = 1;
private static final int O_RDWR = 2;
@ -301,7 +303,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
if (fc == null) {
this.channel = fc = FileChannelImpl.open(fd, path, true,
rw, false, this);
if (closed.get()) {
if (closed) {
try {
fc.close();
} catch (IOException ioe) {
@ -638,14 +640,21 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* @spec JSR-51
*/
public void close() throws IOException {
if (!closed.compareAndSet(false, true)) {
// if compareAndSet() returns false closed was already true
if (closed) {
return;
}
synchronized (closeLock) {
if (closed) {
return;
}
closed = true;
}
FileChannel fc = channel;
if (fc != null) {
fc.close();
// possible race with getChannel(), benign since
// FileChannel.close is final and idempotent
fc.close();
}
fd.closeAll(new Closeable() {