Moved executor null check to AsyncExecutionInterceptor, allowing AbstractAsyncExecutionAspect to fall back to sync execution (as in 3.2.1)

Issue: SPR-10636

Author: jhoeller

spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java

@@ -88,7 +88,7 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 
 	/**
 	 * Determine the specific executor to use when executing the given method.
-	 * @return the executor to use (never {@code null})
+	 * @return the executor to use (or {@code null}, but just if no default executor has been set)
 	 */
 	protected AsyncTaskExecutor determineAsyncExecutor(Method method) {
 		AsyncTaskExecutor executor = this.executors.get(method);
@@ -102,8 +102,7 @@ protected AsyncTaskExecutor determineAsyncExecutor(Method method) {
 						this.beanFactory, Executor.class, qualifier);
 			}
 			else if (executorToUse == null) {
-				throw new IllegalStateException("No executor qualifier specified and no default executor set on " +
-						getClass().getSimpleName() + " either");
+				return null;
 			}
 			executor = (executorToUse instanceof AsyncTaskExecutor ?
 					(AsyncTaskExecutor) executorToUse : new TaskExecutorAdapter(executorToUse));

spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java

@@ -83,7 +83,13 @@ public Object invoke(final MethodInvocation invocation) throws Throwable {
 		Method specificMethod = ClassUtils.getMostSpecificMethod(invocation.getMethod(), targetClass);
 		specificMethod = BridgeMethodResolver.findBridgedMethod(specificMethod);
 
-		Future<?> result = determineAsyncExecutor(specificMethod).submit(
+		AsyncTaskExecutor executor = determineAsyncExecutor(specificMethod);
+		if (executor == null) {
+			throw new IllegalStateException(
+					"No executor specified and no default executor set on AsyncExecutionInterceptor either");
+		}
+
+		Future<?> result = executor.submit(
 				new Callable<Object>() {
 					@Override
 					public Object call() throws Exception {