Merge branch '2.0.x'

wilkinsona · wilkinsona · commit 58bc758c37ab · 2022-07-15T12:52:41.000+01:00
diff --git a/spring-restdocs-core/src/test/java/org/springframework/restdocs/templates/StandardTemplateResourceResolverTests.java b/spring-restdocs-core/src/test/java/org/springframework/restdocs/templates/StandardTemplateResourceResolverTests.java
@@ -110,6 +110,9 @@ private <T> T doWithThreadContextClassLoader(ClassLoader classLoader, Callable<T
 			return action.call();
 		}
 		catch (Exception ex) {
+			if (ex instanceof RuntimeException) {
+				throw (RuntimeException) ex;
+			}
 			throw new RuntimeException(ex);
 		}
 		finally {

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,9 @@ private <T> T doWithThreadContextClassLoader(ClassLoader classLoader, Callable<T`
`110`	`110`	`return action.call();`
`111`	`111`	`}`
`112`	`112`	`catch (Exception ex) {`
	`113`	`+ if (ex instanceof RuntimeException) {`
	`114`	`+ throw (RuntimeException) ex;`
	`115`	`+ }`
`113`	`116`	`throw new RuntimeException(ex);`
`114`	`117`	`}`
`115`	`118`	`finally {`