Polishing JettyClientHttpRequestFactory

Author: poutsma

spring-web/src/main/java/org/springframework/http/client/JettyClientHttpRequest.java

@@ -18,6 +18,7 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.UncheckedIOException;
 import java.net.URI;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -98,8 +99,24 @@ protected ClientHttpResponse executeInternal(HttpHeaders headers, @Nullable Body
 			Thread.currentThread().interrupt();
 			throw new IOException("Request was interrupted: " + ex.getMessage(), ex);
 		}
-		catch (TimeoutException | ExecutionException ex) {
-			throw new IOException("Could not send request: " + ex.getMessage(), ex);
+		catch (ExecutionException ex) {
+			Throwable cause = ex.getCause();
+
+			if (cause instanceof UncheckedIOException uioEx) {
+				throw uioEx.getCause();
+			}
+			if (cause instanceof RuntimeException rtEx) {
+				throw rtEx;
+			}
+			else if (cause instanceof IOException ioEx) {
+				throw ioEx;
+			}
+			else {
+				throw new IOException(cause.getMessage(), cause);
+			}
+		}
+		catch (TimeoutException ex) {
+			throw new IOException("Request timed out: " + ex.getMessage(), ex);
 		}
 	}
 }