diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleAsyncUncaughtExceptionHandler.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleAsyncUncaughtExceptionHandler.java index 984a7ec2458..dffba79e80e 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleAsyncUncaughtExceptionHandler.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleAsyncUncaughtExceptionHandler.java @@ -38,4 +38,5 @@ public class SimpleAsyncUncaughtExceptionHandler implements AsyncUncaughtExcepti "method '%s'.", method), ex); } } + } diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java index 02208114757..310c8810aea 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java +++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java @@ -105,7 +105,7 @@ public class AsyncAnnotationAdvisor extends AbstractPointcutAdvisor implements B * Specify the default task executor to use for asynchronous methods. */ public void setTaskExecutor(Executor executor) { - this.advice = buildAdvice(executor, exceptionHandler); + this.advice = buildAdvice(executor, this.exceptionHandler); } /** diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java index 285ec33f721..6144c786c83 100644 --- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java +++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 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. @@ -139,7 +139,7 @@ public class HttpInvokerClientInterceptor extends RemoteInvocationBasedAccessor } RemoteInvocation invocation = createRemoteInvocation(methodInvocation); - RemoteInvocationResult result = null; + RemoteInvocationResult result; try { result = executeRequest(invocation, methodInvocation); }