root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

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
This commit is contained in:
Rossen Stoyanchev 2016-06-01 17:32:05 -04:00
parent 8cf5ea91f8
commit 431fedccc7
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web-reactive/build.gradle
View File

@ -30,7 +30,7 @@ ext {
springVersion = '4.3.0.BUILD-SNAPSHOT' springVersion = '4.3.0.BUILD-SNAPSHOT'
reactorVersion = '2.5.0.BUILD-SNAPSHOT' reactorVersion = '2.5.0.BUILD-SNAPSHOT'
reactorNettyVersion = '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' tomcatVersion = '8.5.2'
jettyVersion = '9.3.8.v20160314' jettyVersion = '9.3.8.v20160314'
nettyVersion = '4.1.0.CR6' nettyVersion = '4.1.0.CR6'

4
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java
View File

@ -93,9 +93,7 @@ public class RxNettyServerHttpRequest extends AbstractServerHttpRequest {
@Override @Override
public Flux<DataBuffer> getBody() { public Flux<DataBuffer> getBody() {
Observable<DataBuffer> content = Observable<DataBuffer> content = this.request.getContent().map(dataBufferFactory::wrap);
this.request.getContent().map(dataBufferFactory::wrap);
content = content.concatWith(Observable.empty()); // See GH issue #58
return RxJava1ObservableConverter.from(content); return RxJava1ObservableConverter.from(content);
} }