AsyncResult properly propagates execution exception

Issue: SPR-14249
(cherry picked from commit 1b1aac9)

spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@ import org.springframework.util.concurrent.SuccessCallback;
  * to the caller.
  *
  * @author Juergen Hoeller
+ * @author Rossen Stoyanchev
  * @since 3.0
  * @see Async
  * @see #forValue(Object)
@@ -102,11 +103,17 @@ public class AsyncResult<V> implements ListenableFuture<V> {
 
 	@Override
 	public void addCallback(SuccessCallback<? super V> successCallback, FailureCallback failureCallback) {
-		try {
-			successCallback.onSuccess(this.value);
+		if (this.executionException != null) {
+			Throwable cause = this.executionException.getCause();
+			failureCallback.onFailure(cause != null ? cause : this.executionException);
 		}
-		catch (Throwable ex) {
-			failureCallback.onFailure(ex);
+		else {
+			try {
+				successCallback.onSuccess(this.value);
+			}
+			catch (Throwable ex) {
+				failureCallback.onFailure(ex);
+			}
 		}
 	}
 

spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncResultTests.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2002-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.scheduling.annotation;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.Test;
+
+import org.springframework.util.concurrent.ListenableFuture;
+import org.springframework.util.concurrent.ListenableFutureCallback;
+
+import static org.junit.Assert.*;
+
+/**
+ * @author Juergen Hoeller
+ */
+public class AsyncResultTests {
+
+	@Test
+	public void asyncResultWithCallbackAndValue() {
+		String value = "val";
+		final Set<String> values = new HashSet<>(1);
+		ListenableFuture<String> future = AsyncResult.forValue(value);
+		future.addCallback(new ListenableFutureCallback<String>() {
+			@Override
+			public void onSuccess(String result) {
+				values.add(result);
+			}
+			@Override
+			public void onFailure(Throwable ex) {
+				fail("Failure callback not expected: " + ex);
+			}
+		});
+		assertSame(value, values.iterator().next());
+	}
+
+	@Test
+	public void asyncResultWithCallbackAndException() {
+		IOException ex = new IOException();
+		final Set<Throwable> values = new HashSet<>(1);
+		ListenableFuture<String> future = AsyncResult.forExecutionException(ex);
+		future.addCallback(new ListenableFutureCallback<String>() {
+			@Override
+			public void onSuccess(String result) {
+				fail("Success callback not expected: " + result);
+			}
+			@Override
+			public void onFailure(Throwable ex) {
+				values.add(ex);
+			}
+		});
+		assertSame(ex, values.iterator().next());
+	}
+
+	@Test
+	public void asyncResultWithSeparateCallbacksAndValue() {
+		String value = "val";
+		final Set<String> values = new HashSet<>(1);
+		ListenableFuture<String> future = AsyncResult.forValue(value);
+		future.addCallback(values::add, (ex) -> fail("Failure callback not expected: " + ex));
+		assertSame(value, values.iterator().next());
+	}
+
+	@Test
+	public void asyncResultWithSeparateCallbacksAndException() {
+		IOException ex = new IOException();
+		final Set<Throwable> values = new HashSet<>(1);
+		ListenableFuture<String> future = AsyncResult.forExecutionException(ex);
+		future.addCallback((result) -> fail("Success callback not expected: " + result), values::add);
+		assertSame(ex, values.iterator().next());
+	}
+
+}