From 2956049c304c78b675568b61b0c6e638228b8db0 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Wed, 22 Oct 2014 17:04:50 +0200
Subject: [PATCH] Polishing

---
 .../scheduling/annotation/AsyncResult.java           |  4 ++--
 .../util/concurrent/ListenableFutureAdapter.java     | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java
index 63c9d760ea..445fcb607f 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java
@@ -84,8 +84,8 @@ public class AsyncResult<V> implements ListenableFuture<V> {
 		try {
 			successCallback.onSuccess(this.value);
 		}
-		catch (Throwable t) {
-			failureCallback.onFailure(t);
+		catch (Throwable ex) {
+			failureCallback.onFailure(ex);
 		}
 	}
 
diff --git a/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureAdapter.java b/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureAdapter.java
index b0f51fb554..89e0be36b7 100644
--- a/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureAdapter.java
+++ b/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureAdapter.java
@@ -21,9 +21,9 @@ import java.util.concurrent.ExecutionException;
 /**
  * Abstract class that adapts a {@link ListenableFuture} parameterized over S into a
  * {@code ListenableFuture} parameterized over T. All methods are delegated to the
- * adaptee, where {@link #get()}, {@link #get(long, java.util.concurrent.TimeUnit)}, and
- * {@link ListenableFutureCallback#onSuccess(Object)} call {@link #adapt(Object)} on the
- * adaptee's result.
+ * adaptee, where {@link #get()}, {@link #get(long, java.util.concurrent.TimeUnit)},
+ * and {@link ListenableFutureCallback#onSuccess(Object)} call {@link #adapt(Object)}
+ * on the adaptee's result.
  *
  * @param <T> the type of this {@code Future}
  * @param <S> the type of the adaptee's {@code Future}
@@ -34,7 +34,7 @@ public abstract class ListenableFutureAdapter<T, S> extends FutureAdapter<T, S>
 
 	/**
 	 * Construct a new {@code ListenableFutureAdapter} with the given adaptee.
-	 * @param adaptee the future to adaptee to
+	 * @param adaptee the future to adapt to
 	 */
 	protected ListenableFutureAdapter(ListenableFuture<S> adaptee) {
 		super(adaptee);
@@ -59,8 +59,8 @@ public abstract class ListenableFutureAdapter<T, S> extends FutureAdapter<T, S>
 					Throwable cause = ex.getCause();
 					onFailure(cause != null ? cause : ex);
 				}
-				catch (Throwable t) {
-					onFailure(t);
+				catch (Throwable ex) {
+					onFailure(ex);
 				}
 			}
 			@Override