Skip to content

8358496: Concurrent reading from Socket with timeout executes sequentially #2470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

8358496: Concurrent reading from Socket with timeout executes sequentially #2470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd2e991
Backport 7838321b74276e45b92c54904ea31ef70ed9e33f
rm-gh-8 Nov 13, 2025
e2b8883
Refactor for JDK version compatibility
rm-gh-8 Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,19 +289,18 @@ private int timedRead(FileDescriptor fd, byte[] b, int off, int len, long nanos)
* @throws SocketException if the socket is closed or a socket I/O error occurs
* @throws SocketTimeoutException if the read timeout elapses
*/
private int implRead(byte[] b, int off, int len) throws IOException {
private int implRead(byte[] b, int off, int len, long remainingNanos) throws IOException {
int n = 0;
FileDescriptor fd = beginRead();
try {
if (connectionReset)
throw new SocketException("Connection reset");
if (isInputClosed)
return -1;
int timeout = this.timeout;
configureNonBlockingIfNeeded(fd, timeout > 0);
if (timeout > 0) {
configureNonBlockingIfNeeded(fd, remainingNanos > 0);
if (remainingNanos > 0) {
// read with timeout
n = timedRead(fd, b, off, len, MILLISECONDS.toNanos(timeout));
n = timedRead(fd, b, off, len, remainingNanos);
} else {
// read, no timeout
n = tryRead(fd, b, off, len);
Expand Down Expand Up @@ -336,14 +335,24 @@ private int read(byte[] b, int off, int len) throws IOException {
if (len == 0) {
return 0;
} else {
readLock.lock();
long remainingNanos = 0;
int timeout = this.timeout;
if (timeout > 0) {
remainingNanos = tryLock(readLock, timeout, MILLISECONDS);
if (remainingNanos <= 0) {
assert !readLock.isHeldByCurrentThread();
throw new SocketTimeoutException("Read timed out");
}
} else {
readLock.lock();
}
try {
// emulate legacy behavior to return -1, even if socket is closed
if (readEOF)
return -1;
// read up to MAX_BUFFER_SIZE bytes
int size = Math.min(len, MAX_BUFFER_SIZE);
int n = implRead(b, off, size);
int n = implRead(b, off, size, remainingNanos);
if (n == -1)
readEOF = true;
return n;
Expand Down
Loading