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

8334719: (se) Deferred close of SelectableChannel may result in a Selector doing the final close before concurrent I/O on channel has completed

Browse source 
Co-authored-by: Alan Bateman <alanb@openjdk.org>
Reviewed-by: alanb, dfuchs
This commit is contained in:
Jaikiran Pai 2024-06-27 04:38:32 +00:00
parent 6682305ee2
commit 9bb675f89d
7 changed files with 705 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
View file

@ -1945,6 +1945,11 @@ class DatagramChannelImpl
@Override
public void kill() {
// wait for any read/write operations to complete before trying to close
readLock.lock();
readLock.unlock();
writeLock.lock();
writeLock.unlock();
synchronized (stateLock) {
if (state == ST_CLOSING) {
tryFinishClose();

3
src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
View file

@ -654,6 +654,9 @@ class ServerSocketChannelImpl
@Override
public void kill() {
// wait for any accept operation to complete before trying to close
acceptLock.lock();
acceptLock.unlock();
synchronized (stateLock) {
if (state == ST_CLOSING) {
tryFinishClose();

5
src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
View file

@ -1216,6 +1216,11 @@ class SocketChannelImpl
@Override
public void kill() {
// wait for any read/write operations to complete before trying to close
readLock.lock();
readLock.unlock();
writeLock.lock();
writeLock.unlock();
synchronized (stateLock) {
if (state == ST_CLOSING) {
tryFinishClose();