Skip to content
Permalink
Browse files
8276763: java/nio/channels/SocketChannel/AdaptorStreams.java fails wi…
…th "SocketTimeoutException: Read timed out"

Reviewed-by: dfuchs
  • Loading branch information
Alan Bateman committed Nov 11, 2021
1 parent 6f35eed commit 8aae88b0fc4acb76ef140f120712403cf4b04a46
Showing with 10 additions and 10 deletions.
  1. +10 −10 test/jdk/java/nio/channels/SocketChannel/AdaptorStreams.java
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -158,7 +158,7 @@ public void testTimedRead1() throws Exception {
withConnection((sc, peer) -> {
peer.getOutputStream().write(99);
Socket s = sc.socket();
s.setSoTimeout(1000);
s.setSoTimeout(60_000);
int n = s.getInputStream().read();
assertEquals(n, 99);
});
@@ -171,7 +171,7 @@ public void testTimedRead2() throws Exception {
withConnection((sc, peer) -> {
scheduleWrite(peer.getOutputStream(), 99, 1000);
Socket s = sc.socket();
s.setSoTimeout(5000);
s.setSoTimeout(60_000);
int n = s.getInputStream().read();
assertEquals(n, 99);
});
@@ -183,7 +183,7 @@ public void testTimedRead2() throws Exception {
public void testTimedRead3() throws Exception {
withConnection((sc, peer) -> {
Socket s = sc.socket();
s.setSoTimeout(1000);
s.setSoTimeout(500);
InputStream in = s.getInputStream();
expectThrows(SocketTimeoutException.class, () -> in.read());
});
@@ -196,7 +196,7 @@ public void testTimedRead4() throws Exception {
withConnection((sc, peer) -> {
scheduleClose(sc, 2000);
Socket s = sc.socket();
s.setSoTimeout(60*1000);
s.setSoTimeout(60_000);
InputStream in = s.getInputStream();
expectThrows(IOException.class, () -> in.read());
});
@@ -210,7 +210,7 @@ public void testTimedRead5() throws Exception {
Socket s = sc.socket();
Thread.currentThread().interrupt();
try {
s.setSoTimeout(60*1000);
s.setSoTimeout(60_000);
InputStream in = s.getInputStream();
expectThrows(IOException.class, () -> in.read());
} finally {
@@ -228,7 +228,7 @@ public void testTimedRead6() throws Exception {
Future<?> interrupter = scheduleInterrupt(Thread.currentThread(), 2000);
Socket s = sc.socket();
try {
s.setSoTimeout(60*1000);
s.setSoTimeout(60_000);
InputStream in = s.getInputStream();
expectThrows(IOException.class, () -> in.read());
assertTrue(s.isClosed());
@@ -396,7 +396,7 @@ public void testConcurrentTimedReadWrite1() throws Exception {

// test read when bytes are available
peer.getOutputStream().write(99);
s.setSoTimeout(60*1000);
s.setSoTimeout(60_000);
int n = s.getInputStream().read();
assertEquals(n, 99);
});
@@ -421,7 +421,7 @@ public void testConcurrentTimedReadWrite2() throws Exception {

// test read blocking until bytes are available
scheduleWrite(peer.getOutputStream(), 99, 500);
s.setSoTimeout(60*1000);
s.setSoTimeout(60_000);
int n = s.getInputStream().read();
assertEquals(n, 99);
});
@@ -436,7 +436,7 @@ public void testConcurrentTimedReadWrite3() throws Exception {

// block thread in read
execute(() -> {
s.setSoTimeout(60*1000);
s.setSoTimeout(60_000);
s.getInputStream().read();
});
Thread.sleep(100); // give reader time to block

1 comment on commit 8aae88b

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on 8aae88b Nov 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.