From 3402c1380373aa91d5d0c9dc3d66fbd4e99e07d5 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 2 Sep 2015 18:04:11 +0200 Subject: [PATCH] Undo FutureAdapter's catching of Throwable in 4.1.x Issue: SPR-13413 Issue: SPR-12887 --- .../org/springframework/util/concurrent/FutureAdapter.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/util/concurrent/FutureAdapter.java b/spring-core/src/main/java/org/springframework/util/concurrent/FutureAdapter.java index 37aac9310e..84cc344ab8 100644 --- a/spring-core/src/main/java/org/springframework/util/concurrent/FutureAdapter.java +++ b/spring-core/src/main/java/org/springframework/util/concurrent/FutureAdapter.java @@ -107,12 +107,6 @@ public abstract class FutureAdapter implements Future { this.state = State.FAILURE; throw ex; } - catch (Throwable ex) { - ExecutionException execEx = new ExecutionException(ex); - this.result = execEx; - this.state = State.FAILURE; - throw execEx; - } default: throw new IllegalStateException(); }