Fix throws only ResourceAccessException on timeout spring-projects#33973

CancellationExceptions are thrown instead of the expected ResourceAccessException during timeout scenarios.
Handle the CancellationExceptions in order to throw an ResourceAccessException when timeout occurred

Closes spring-projectsgh-33973

Author: giampa91

Diff for: spring-web/src/main/java/org/springframework/http/client/JdkClientHttpRequest.java

@@ -70,9 +70,8 @@ class JdkClientHttpRequest extends AbstractStreamingClientHttpRequest {
 
 	private final @Nullable Duration timeout;
 
-
 	public JdkClientHttpRequest(HttpClient httpClient, URI uri, HttpMethod method, Executor executor,
-			@Nullable Duration readTimeout) {
+								@Nullable Duration readTimeout) {
 
 		this.httpClient = httpClient;
 		this.uri = uri;
@@ -81,7 +80,6 @@ public JdkClientHttpRequest(HttpClient httpClient, URI uri, HttpMethod method, E
 		this.timeout = readTimeout;
 	}
 
-
 	@Override
 	public HttpMethod getMethod() {
 		return this.method;
@@ -92,16 +90,15 @@ public URI getURI() {
 		return this.uri;
 	}
 
-
 	@Override
 	protected ClientHttpResponse executeInternal(HttpHeaders headers, @Nullable Body body) throws IOException {
 		CompletableFuture<HttpResponse<InputStream>> responseFuture = null;
+		TimeoutHandler timeoutHandler = null;
 		try {
 			HttpRequest request = buildRequest(headers, body);
 			responseFuture = this.httpClient.sendAsync(request, HttpResponse.BodyHandlers.ofInputStream());
-
 			if (this.timeout != null) {
-				TimeoutHandler timeoutHandler = new TimeoutHandler(responseFuture, this.timeout);
+				timeoutHandler = new TimeoutHandler(responseFuture, this.timeout);
 				HttpResponse<InputStream> response = responseFuture.get();
 				InputStream inputStream = timeoutHandler.wrapInputStream(response);
 				return new JdkClientHttpResponse(response, inputStream);
@@ -136,6 +133,13 @@ else if (cause instanceof IOException ioEx) {
 				throw (message == null ? new IOException(cause) : new IOException(message, cause));
 			}
 		}
+		catch (CancellationException ex) {
+			if(timeoutHandler != null && timeoutHandler.isTimeout){
+				throw new HttpTimeoutException("Request timed out");
+			}
+			Throwable cause = ex.getCause();
+			throw new IOException(cause.getMessage(), cause);
+		}
 	}
 
 	private HttpRequest buildRequest(HttpHeaders headers, @Nullable Body body) {
@@ -224,6 +228,7 @@ public ByteBuffer map(byte[] b, int off, int len) {
 	private static final class TimeoutHandler {
 
 		private final CompletableFuture<Void> timeoutFuture;
+		boolean isTimeout=false;
 
 		private TimeoutHandler(CompletableFuture<HttpResponse<InputStream>> future, Duration timeout) {
 
@@ -232,6 +237,7 @@ private TimeoutHandler(CompletableFuture<HttpResponse<InputStream>> future, Dura
 
 			this.timeoutFuture.thenRun(() -> {
 				if (future.cancel(true) || future.isCompletedExceptionally() || !future.isDone()) {
+					this.isTimeout = true;
 					return;
 				}
 				try {