archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8189963: Remove version of FileChannelImpl::open without the 'direct' parameter

Browse source 
Remove old version of FileChannelImpl::open and update call sites

Reviewed-by: rriggs
This commit is contained in:
Brian Burkhalter 2017-10-26 11:08:31 -07:00
parent 9615ad79e8
commit 18cbe428c1
5 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/java.base/share/classes/java/io/FileInputStream.java
View file

@ -385,7 +385,8 @@ class FileInputStream extends InputStream
synchronized (this) {
fc = this.channel;
if (fc == null) {
this.channel = fc = FileChannelImpl.open(fd, path, true, false, this);
this.channel = fc = FileChannelImpl.open(fd, path, true,
false, false, this);
if (closed) {
try {
// possible race with close(), benign since

3
src/java.base/share/classes/java/io/FileOutputStream.java
View file

@ -410,7 +410,8 @@ class FileOutputStream extends OutputStream
synchronized (this) {
fc = this.channel;
if (fc == null) {
this.channel = fc = FileChannelImpl.open(fd, path, false, true, this);
this.channel = fc = FileChannelImpl.open(fd, path, false,
true, false, this);
if (closed) {
try {
// possible race with close(), benign since

3
src/java.base/share/classes/java/io/RandomAccessFile.java
View file

@ -298,7 +298,8 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
synchronized (this) {
fc = this.channel;
if (fc == null) {
this.channel = fc = FileChannelImpl.open(fd, path, true, rw, this);
this.channel = fc = FileChannelImpl.open(fd, path, true,
rw, false, this);
if (closed.get()) {
try {
fc.close();

7
src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
View file

@ -140,13 +140,6 @@ public class FileChannelImpl
// Used by FileInputStream.getChannel(), FileOutputStream.getChannel
// and RandomAccessFile.getChannel()
public static FileChannel open(FileDescriptor fd, String path,
boolean readable, boolean writable,
Object parent)
{
return new FileChannelImpl(fd, path, readable, writable, false, parent);
}
public static FileChannel open(FileDescriptor fd, String path,
boolean readable, boolean writable,
boolean direct, Object parent)

2
src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java
View file

@ -110,7 +110,7 @@ class UnixChannelFactory {
static FileChannel newFileChannel(int fd, String path, boolean reading, boolean writing) {
FileDescriptor fdObj = new FileDescriptor();
fdAccess.set(fdObj, fd);
return FileChannelImpl.open(fdObj, path, reading, writing, null);
return FileChannelImpl.open(fdObj, path, reading, writing, false, null);
}
/**