archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 11:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8201474: (so) Socket adaptor connect(InetAddress, timeout) succeeds when connection fails

Browse source 
Reviewed-by: bpb
This commit is contained in:
Alan Bateman 2018-04-14 08:41:42 +01:00
parent 85fbf32898
commit 45fb75c85a
5 changed files with 46 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1280,8 +1280,8 @@ class DatagramChannelImpl
boolean polled = false;
try {
beginRead(blocking, false);
int n = Net.poll(fd, Net.POLLIN, timeout);
polled = (n > 0);
int events = Net.poll(fd, Net.POLLIN, timeout);
polled = (events != 0);
} finally {
endRead(blocking, polled);
}

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

@ -431,8 +431,8 @@ class ServerSocketChannelImpl
boolean polled = false;
try {
begin(true);
int n = Net.poll(fd, Net.POLLIN, timeout);
polled = (n > 0);
int events = Net.poll(fd, Net.POLLIN, timeout);
polled = (events != 0);
} finally {
end(true, polled);
}

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

@ -951,8 +951,8 @@ class SocketChannelImpl
boolean polled = false;
try {
beginRead(blocking);
int n = Net.poll(fd, Net.POLLIN, timeout);
polled = (n > 0);
int events = Net.poll(fd, Net.POLLIN, timeout);
polled = (events != 0);
} finally {
endRead(blocking, polled);
}
@ -977,10 +977,13 @@ class SocketChannelImpl
boolean polled = false;
try {
beginFinishConnect(blocking);
int n = Net.poll(fd, Net.POLLCONN, timeout);
polled = (n > 0);
int events = Net.poll(fd, Net.POLLCONN, timeout);
polled = (events != 0);
} finally {
endFinishConnect(blocking, polled);
// invoke endFinishConnect with completed = false so that
// the state is not changed to ST_CONNECTED. The socket
// adaptor will use finishConnect to finish.
endFinishConnect(blocking, /*completed*/false);
}
return polled;
} finally {

3
src/java.base/unix/native/libnio/ch/Net.c
View file

@ -700,7 +700,8 @@ Java_sun_nio_ch_Net_poll(JNIEnv* env, jclass this, jobject fdo, jint events, jlo
if (rv >= 0) {
return pfd.revents;
} else if (errno == EINTR) {
return IOS_INTERRUPTED;
// interrupted, no events to return
return 0;
} else {
handleSocketError(env, errno);
return IOS_THROWN;