Improve check for actual return value type

rstoyanchev · rstoyanchev · commit 03eb6f76db22 · 2017-09-05T16:11:35.000-04:00
Issue: SPR-15910
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java
@@ -101,7 +101,8 @@ protected Mono<Void> writeBody(@Nullable Object body, MethodParameter bodyParame
 		}
 		else {
 			publisher = Mono.justOrEmpty(body);
-			elementType = (bodyClass == null && body != null ? ResolvableType.forInstance(body) : bodyType);
+			elementType = ((bodyClass == null || bodyClass.equals(Object.class)) && body != null ?
+					ResolvableType.forInstance(body) : bodyType);
 		}
 
 		if (void.class == elementType.getRawClass() || Void.class == elementType.getRawClass()) {

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,8 @@ protected Mono<Void> writeBody(@Nullable Object body, MethodParameter bodyParame`
`101`	`101`	`}`
`102`	`102`	`else {`
`103`	`103`	`publisher = Mono.justOrEmpty(body);`
`104`		`- elementType = (bodyClass == null && body != null ? ResolvableType.forInstance(body) : bodyType);`
	`104`	`+ elementType = ((bodyClass == null \|\| bodyClass.equals(Object.class)) && body != null ?`
	`105`	`+ ResolvableType.forInstance(body) : bodyType);`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`if (void.class == elementType.getRawClass() \|\| Void.class == elementType.getRawClass()) {`