From b8d32095a993e2f16e02aae6fc4b3e1534844bf4 Mon Sep 17 00:00:00 2001 From: Stephane Maldini Date: Fri, 30 Mar 2018 15:42:23 -0700 Subject: [PATCH] workaround multipart integration test using blocking receive inside netty thread --- .../server/reactive/MultipartIntegrationTests.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/MultipartIntegrationTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/MultipartIntegrationTests.java index 5f97aa889b9..a756612bc85 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/MultipartIntegrationTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/MultipartIntegrationTests.java @@ -103,11 +103,12 @@ public class MultipartIntegrationTests extends AbstractHttpHandlerIntegrationTes assertEquals("fooPart", part.name()); assertTrue(part instanceof FilePart); assertEquals("foo.txt", ((FilePart) part).filename()); - DataBuffer buffer = DataBufferUtils.join(part.content()).block(); - assertEquals(12, buffer.readableByteCount()); - byte[] byteContent = new byte[12]; - buffer.read(byteContent); - assertEquals("Lorem Ipsum.", new String(byteContent)); + DataBufferUtils.join(part.content()).subscribe(buffer -> { + assertEquals(12, buffer.readableByteCount()); + byte[] byteContent = new byte[12]; + buffer.read(byteContent); + assertEquals("Lorem Ipsum.", new String(byteContent)); + }); } private void assertBarPart(Part part) {