Refine publisher type check in CoroutinesUtils

See spring-projectsgh-32390
sdeleuze · Mar 11, 2024 · 946082f · 946082f
1 parent 78fb378
commit 946082f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java b/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
@@ -148,10 +148,10 @@ public static Publisher<?> invokeSuspendingFunction(CoroutineContext context, Me
 		if (KTypes.isSubtypeOf(returnType, flowType)) {
 			return mono.flatMapMany(CoroutinesUtils::asFlux);
 		}
-		else if (KTypes.isSubtypeOf(returnType, monoType)) {
-			return mono.flatMap(o -> ((Mono<?>)o));
-		}
-		else if (KTypes.isSubtypeOf(returnType, publisherType)) {
+		if (KTypes.isSubtypeOf(returnType, publisherType)) {
+			if (KTypes.isSubtypeOf(returnType, monoType)) {
+				return mono.flatMap(o -> ((Mono<?>)o));
+			}
 			return mono.flatMapMany(o -> ((Publisher<?>)o));
 		}
 		return mono;