Browse Source

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
pull/1111/head
Rossen Stoyanchev 9 years ago
parent
commit
431fedccc7
  1. 2
      spring-web-reactive/build.gradle
  2. 4
      spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java

2
spring-web-reactive/build.gradle

@ -30,7 +30,7 @@ ext { @@ -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'

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

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

Loading…
Cancel
Save