From 431fedccc7ca95d48adedc6d9a7401b1fdbd3034 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Wed, 1 Jun 2016 17:32:05 -0400 Subject: [PATCH] Upgrade to RxJava 1.1.5 After the fix for ReactiveX/RxNetty#509 we can remove the workaround to concatenate with an empty Observable for the request body and upgrade to the latest RxJava 1.1.5. Issues: #103 --- spring-web-reactive/build.gradle | 2 +- .../http/server/reactive/RxNettyServerHttpRequest.java | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-web-reactive/build.gradle b/spring-web-reactive/build.gradle index b6811b7eff..7e18f1e4e1 100644 --- a/spring-web-reactive/build.gradle +++ b/spring-web-reactive/build.gradle @@ -30,7 +30,7 @@ ext { springVersion = '4.3.0.BUILD-SNAPSHOT' reactorVersion = '2.5.0.BUILD-SNAPSHOT' reactorNettyVersion = '2.5.0.BUILD-SNAPSHOT' - rxJavaVersion = '1.1.1' // See issue #103 + rxJavaVersion = '1.1.5' tomcatVersion = '8.5.2' jettyVersion = '9.3.8.v20160314' nettyVersion = '4.1.0.CR6' diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java index cd07391ade..fd5a5de1ef 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java @@ -93,9 +93,7 @@ public class RxNettyServerHttpRequest extends AbstractServerHttpRequest { @Override public Flux getBody() { - Observable content = - this.request.getContent().map(dataBufferFactory::wrap); - content = content.concatWith(Observable.empty()); // See GH issue #58 + Observable content = this.request.getContent().map(dataBufferFactory::wrap); return RxJava1ObservableConverter.from(content); }