infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-02 19:20:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove isAcceptableCause

Browse Source
This commit is contained in:
Volkan Yazıcı 2026-02-05 10:20:48 +01:00
parent cf2f32531a
commit 2bc6cf3a58
No known key found for this signature in database
GPG Key ID: D37D4387C9BD368E
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
test/jdk/java/net/httpclient/ConnectTimeoutTest.java
View File

@ -30,7 +30,6 @@ import java.io.IOException;
import java.io.PrintStream;
import java.net.ConnectException;
import java.net.InetAddress;
import java.net.NoRouteToHostException;
import java.net.Proxy;
import java.net.ProxySelector;
import java.net.ServerSocket;
@ -45,7 +44,6 @@ import java.net.http.HttpRequest;
import java.net.http.HttpRequest.BodyPublishers;
import java.net.http.HttpResponse;
import java.net.http.HttpResponse.BodyHandlers;
import java.nio.channels.UnresolvedAddressException;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
@ -289,13 +287,8 @@ class ConnectTimeoutTest {
long elapsedTime = NANOSECONDS.toMillis(System.nanoTime() - startTime);
LOGGER.printf("Client: received in %d millis%n", elapsedTime);
Throwable t = e.getCause().getCause(); // blocking thread-specific exception
if (!isAcceptableCause(t)) { // tolerate only NRTHE or UAE
e.printStackTrace(LOGGER);
fail("Unexpected exception:" + e);
} else {
LOGGER.printf("Caught ConnectException with "
+ " cause: %s - skipping%n", t.getCause());
}
e.printStackTrace(LOGGER);
fail("Unexpected exception:" + e);
}
}
}
@ -319,23 +312,11 @@ class ConnectTimeoutTest {
long elapsedTime = NANOSECONDS.toMillis(System.nanoTime() - startTime);
LOGGER.printf("Client: received in %d millis%n", elapsedTime);
Throwable t = e.getCause();
if (t instanceof ConnectException && isAcceptableCause(t.getCause())) {
// tolerate only NRTHE and UAE
LOGGER.printf("Caught ConnectException with "
+ "cause: %s - skipping%n", t.getCause());
} else {
assertExceptionTypeAndCause(t);
}
assertExceptionTypeAndCause(t);
}
}
}
private static boolean isAcceptableCause(Throwable cause) {
if (cause instanceof NoRouteToHostException) return true;
if (cause instanceof UnresolvedAddressException) return true;
return false;
}
private static HttpClient newClient(Duration connectTimeout, ProxySelector proxy) {
HttpClient.Builder builder = HttpClient.newBuilder().proxy(proxy);
if (connectTimeout != NO_DURATION)