Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

Browse Source
This commit is contained in:
Sébastien Deleuze
2023-06-23 14:20:13 +02:00
parent d881cd3346 d3a249e34d
commit 35667e81ea
8 changed files with 42 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
View File

@@ -26,7 +26,6 @@ import kotlin.reflect.KFunction;
import kotlin.reflect.KParameter;
import kotlin.reflect.jvm.KCallablesJvm;
import kotlin.reflect.jvm.ReflectJvmMapping;
import org.reactivestreams.Publisher;
import org.springframework.context.MessageSource;
import org.springframework.core.CoroutinesUtils;
@@ -287,7 +286,7 @@ public class InvocableHandlerMethod extends HandlerMethod {
* instead.
* @since 6.0
*/
protected Publisher<?> invokeSuspendingFunction(Method method, Object target, Object[] args) {
protected Object invokeSuspendingFunction(Method method, Object target, Object[] args) {
return CoroutinesUtils.invokeSuspendingFunction(method, target, args);
}