From 9a513cfdea9020c6ed2cf3f37711ed4e31d7c310 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 14 Dec 2021 09:44:12 +0100 Subject: [PATCH] Enforce Future/void return declaration for async methods Closes gh-27734 --- .../aop/interceptor/AsyncExecutionAspectSupport.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java index 8908cab491..33beb7c9e6 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2021 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. @@ -286,10 +286,14 @@ public abstract class AsyncExecutionAspectSupport implements BeanFactoryAware { else if (Future.class.isAssignableFrom(returnType)) { return executor.submit(task); } - else { + else if (void.class == returnType) { executor.submit(task); return null; } + else { + throw new IllegalArgumentException( + "Invalid return type for async method (only Future and void supported): " + returnType); + } } /**