Preserve exception in TimeoutInterceptor...

leonard84 · leonard84 · commit a601d729d09a · 2025-04-05T12:36:19.000+02:00
in case of an interrupt during sync.
Previously, the `InterruptedException` replaced the potential prior
exception.
diff --git a/spock-core/src/main/java/org/spockframework/runtime/extension/builtin/TimeoutInterceptor.java b/spock-core/src/main/java/org/spockframework/runtime/extension/builtin/TimeoutInterceptor.java
@@ -110,7 +110,11 @@ public void intercept(final IMethodInvocation invocation) throws Throwable {
         // As this won't take long, it should also be acceptable if this thread
         // got interrupted by some other thread. To report on the latter case,
         // we save off the exception, overriding any previously saved exception.
-        saved = e;
+        if (saved != null) {
+          saved.addSuppressed(e);
+        } else {
+          saved = e;
+        }
       }
     }
     if (stackTrace.length > 0) {

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,11 @@ public void intercept(final IMethodInvocation invocation) throws Throwable {`
`110`	`110`	`// As this won't take long, it should also be acceptable if this thread`
`111`	`111`	`// got interrupted by some other thread. To report on the latter case,`
`112`	`112`	`// we save off the exception, overriding any previously saved exception.`
`113`		`- saved = e;`
	`113`	`+ if (saved != null) {`
	`114`	`+ saved.addSuppressed(e);`
	`115`	`+ } else {`
	`116`	`+ saved = e;`
	`117`	`+ }`
`114`	`118`	`}`
`115`	`119`	`}`
`116`	`120`	`if (stackTrace.length > 0) {`