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

8286734: (fc) FileChannelImpl#map() cleanup after merge of Foreign Function & Memory API

Browse source 
Reviewed-by: alanb
This commit is contained in:
Brian Burkhalter 2022-05-17 19:43:15 +00:00
parent 0c5ab6daa9
commit 5bea46110c
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1014,6 +1014,10 @@ public class FileChannelImpl
unmap(); unmap();
} }
public long capacity() {
return cap;
}
public void unmap() { public void unmap() {
if (address == 0) if (address == 0)
return; return;
@ -1126,15 +1130,15 @@ public class FileChannelImpl
else else
return Util.newMappedByteBuffer(0, 0, dummy, null, isSync); return Util.newMappedByteBuffer(0, 0, dummy, null, isSync);
} else if ((!writable) || (prot == MAP_RO)) { } else if ((!writable) || (prot == MAP_RO)) {
return Util.newMappedByteBufferR((int)unmapper.cap, return Util.newMappedByteBufferR((int)unmapper.capacity(),
unmapper.address + unmapper.pagePosition, unmapper.address(),
unmapper.fd, unmapper.fileDescriptor(),
unmapper, isSync); unmapper, unmapper.isSync());
} else { } else {
return Util.newMappedByteBuffer((int)unmapper.cap, return Util.newMappedByteBuffer((int)unmapper.capacity(),
unmapper.address + unmapper.pagePosition, unmapper.address(),
unmapper.fd, unmapper.fileDescriptor(),
unmapper, isSync); unmapper, unmapper.isSync());
} }
} }