Merge branch '6.1.x'

jhoeller · jhoeller · commit 7fc2814a3469 · 2024-06-20T18:57:49.000+02:00
diff --git a/spring-web/src/main/java/org/springframework/http/client/ReactorNettyClientRequest.java b/spring-web/src/main/java/org/springframework/http/client/ReactorNettyClientRequest.java
@@ -140,7 +140,7 @@ static IOException convertException(RuntimeException ex) {
 				return ioEx;
 			}
 		}
-		return new IOException(ex.getMessage(), cause);
+		return new IOException(ex.getMessage(), (cause != null ? cause : ex));
 	}
 
 

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ static IOException convertException(RuntimeException ex) {`
`140`	`140`	`return ioEx;`
`141`	`141`	`}`
`142`	`142`	`}`
`143`		`- return new IOException(ex.getMessage(), cause);`
	`143`	`+ return new IOException(ex.getMessage(), (cause != null ? cause : ex));`
`144`	`144`	`}`
`145`	`145`
`146`	`146`