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

8199015: (se) SocketChannelImpl.translateXXXOps access channel state without synchronization

Browse source 
Reviewed-by: bpb
This commit is contained in:
Alan Bateman 2018-03-07 07:15:24 +00:00
parent 889a041f22
commit 61aa187aaf
2 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/java.base/share/classes/sun/nio/ch/SelChImpl.java
View file

@ -63,8 +63,6 @@ public interface SelChImpl extends Channel {
void translateAndSetInterestOps(int ops, SelectionKeyImpl sk);
int validOps();
void kill() throws IOException;
}

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

@ -96,7 +96,7 @@ class SocketChannelImpl
private static final int ST_CLOSING = 3;
private static final int ST_KILLPENDING = 4;
private static final int ST_KILLED = 5;
private int state;
private volatile int state; // need stateLock to change
// IDs of native threads doing reads and writes, for signalling
private long readerThread;
@ -574,16 +574,12 @@ class SocketChannelImpl
@Override
public boolean isConnected() {
synchronized (stateLock) {
return (state == ST_CONNECTED);
}
return (state == ST_CONNECTED);
}
@Override
public boolean isConnectionPending() {
synchronized (stateLock) {
return (state == ST_CONNECTIONPENDING);
}
return (state == ST_CONNECTIONPENDING);
}
/**
@ -604,12 +600,13 @@ class SocketChannelImpl
}
synchronized (stateLock) {
ensureOpen();
int state = this.state;
if (state == ST_CONNECTED)
throw new AlreadyConnectedException();
if (state == ST_CONNECTIONPENDING)
throw new ConnectionPendingException();
assert state == ST_UNCONNECTED;
state = ST_CONNECTIONPENDING;
this.state = ST_CONNECTIONPENDING;
if (localAddress == null)
NetHooks.beforeTcpConnect(fd, isa.getAddress(), isa.getPort());
@ -985,20 +982,17 @@ class SocketChannelImpl
return (newOps & ~oldOps) != 0;
}
boolean connected = isConnected();
if (((ops & Net.POLLIN) != 0) &&
((intOps & SelectionKey.OP_READ) != 0) &&
(state == ST_CONNECTED))
((intOps & SelectionKey.OP_READ) != 0) && connected)
newOps |= SelectionKey.OP_READ;
if (((ops & Net.POLLCONN) != 0) &&
((intOps & SelectionKey.OP_CONNECT) != 0) &&
((state == ST_UNCONNECTED) || (state == ST_CONNECTIONPENDING))) {
((intOps & SelectionKey.OP_CONNECT) != 0) && isConnectionPending())
newOps |= SelectionKey.OP_CONNECT;
}
if (((ops & Net.POLLOUT) != 0) &&
((intOps & SelectionKey.OP_WRITE) != 0) &&
(state == ST_CONNECTED))
((intOps & SelectionKey.OP_WRITE) != 0) && connected)
newOps |= SelectionKey.OP_WRITE;
sk.nioReadyOps(newOps);