Merge branch '5.1.x'

2019-04-17 14:23:44 -04:00
parent 60d6b5a922 13c746ae9d
commit 86835e8e5a
1 changed files with 3 additions and 1 deletions
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java
@@ -122,7 +122,9 @@ class ReactorServerHttpResponse extends AbstractServerHttpResponse implements Ze
 	}

 	private Publisher<ByteBuf> toByteBufs(Publisher<? extends DataBuffer> dataBuffers) {
-		return Flux.from(dataBuffers).map(NettyDataBufferFactory::toByteBuf);
+		return dataBuffers instanceof Mono ?
+				Mono.from(dataBuffers).map(NettyDataBufferFactory::toByteBuf) :
+				Flux.from(dataBuffers).map(NettyDataBufferFactory::toByteBuf);
 	}

 }