From 24a63f1d90ffd58553e805c9ee2f7edca42c3fab Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Thu, 7 Apr 2016 16:04:39 +0200 Subject: [PATCH] Upgrade RxNetty to 0.5.2-SNAPSHOT and Tomcat to 8.0.33 --- spring-web-reactive/build.gradle | 4 ++-- .../http/client/reactive/RxNettyClientHttpResponse.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-web-reactive/build.gradle b/spring-web-reactive/build.gradle index 427767e6ca..8078bbf5c2 100644 --- a/spring-web-reactive/build.gradle +++ b/spring-web-reactive/build.gradle @@ -30,7 +30,7 @@ ext { springVersion = '4.2.3.RELEASE' reactorVersion = '2.5.0.BUILD-SNAPSHOT' reactorNettyVersion = '2.5.0.BUILD-SNAPSHOT' - tomcatVersion = '8.0.28' + tomcatVersion = '8.0.33' jettyVersion = '9.3.5.v20151012' nettyVersion = '4.1.0.CR3' @@ -96,7 +96,7 @@ dependencies { optional "org.springframework:spring-context-support:${springVersion}" // for FreeMarker optional 'io.reactivex:rxjava:1.1.0' - optional "io.reactivex:rxnetty-http:0.5.0-SNAPSHOT" + optional "io.reactivex:rxnetty-http:0.5.2-SNAPSHOT" optional "com.fasterxml.jackson.core:jackson-databind:2.6.2" optional "io.projectreactor:reactor-netty:${reactorNettyVersion}" optional "org.apache.tomcat:tomcat-util:${tomcatVersion}" diff --git a/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/RxNettyClientHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/RxNettyClientHttpResponse.java index 5edd02ef9e..9077bdc0f5 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/RxNettyClientHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/RxNettyClientHttpResponse.java @@ -56,7 +56,7 @@ public class RxNettyClientHttpResponse implements ClientHttpResponse { this.allocator = allocator; this.response = response; this.headers = new HttpHeaders(); - this.response.headerIterator().forEachRemaining(e -> this.headers.set(e.getKey(), e.getValue())); + this.response.headerIterator().forEachRemaining(e -> this.headers.set(e.getKey().toString(), e.getValue().toString())); this.cookies = initCookies(response); }