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

Merge

Browse source
This commit is contained in:
Mikael Vidstedt 2019-08-05 16:27:30 -07:00
commit 2e6e33eba1
8 changed files with 110 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/java.base/windows/native/libnio/ch/Net.c
View file

@ -623,9 +623,6 @@ Java_sun_nio_ch_Net_poll(JNIEnv* env, jclass this, jobject fdo, jint events, jlo
fd_set rd, wr, ex;
jint fd = fdval(env, fdo);
t.tv_sec = (long)(timeout / 1000);
t.tv_usec = (timeout % 1000) * 1000;
FD_ZERO(&rd);
FD_ZERO(&wr);
FD_ZERO(&ex);
@ -638,7 +635,12 @@ Java_sun_nio_ch_Net_poll(JNIEnv* env, jclass this, jobject fdo, jint events, jlo
}
FD_SET(fd, &ex);
rv = select(fd+1, &rd, &wr, &ex, &t);
if (timeout >= 0) {
t.tv_sec = (long)(timeout / 1000);
t.tv_usec = (timeout % 1000) * 1000;
}
rv = select(fd+1, &rd, &wr, &ex, (timeout >= 0) ? &t : NULL);
/* save last winsock error */
if (rv == SOCKET_ERROR) {