Merge branch '0.8.x'

reactor · Mar 14, 2019 · 0560154 · 0560154
2 parents 42f0b52 + 32be1c7
commit 0560154
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/src/main/java/reactor/netty/ByteBufFlux.java b/src/main/java/reactor/netty/ByteBufFlux.java
@@ -256,10 +256,23 @@ public final Flux<String> asString(Charset charset) {
 	 */
 	public ByteBufMono aggregate() {
 		return Mono.using(alloc::compositeBuffer,
-				b -> this.reduce(b, (prev, next) -> prev.addComponent(next.retain()))
+				b -> this.reduce(b,
+				                 (prev, next) -> {
+				                     if (prev.refCnt() > 0) {
+				                         return prev.addComponent(next.retain());
+				                     }
+				                     else {
+				                         return prev;
+				                     }
+				                 })
 				         .doOnNext(cbb -> cbb.writerIndex(cbb.capacity()))
 				         .filter(ByteBuf::isReadable),
-				ByteBuf::release).as(ByteBufMono::new);
+				b -> {
+				    if (b.refCnt() > 0) {
+				        b.release();
+				    }
+				})
+				.as(ByteBufMono::new);
 	}
 
 	/**