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

Remove temporary workaround for reactor-netty client 

Now that https://github.com/reactor/reactor-netty/issues/138 is solved,
this commit removes the temporary workaround introduced in SPR-15784
but leaves the general mechanism for detecting empty responses.
This commit is contained in:
Brian Clozel 2017-09-08 10:27:35 +02:00
parent 69edd4ac50
commit 1a883b863d
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java
View File

@ -38,12 +38,6 @@ import org.springframework.http.HttpMethod;
*/
public class ReactorClientHttpConnector implements ClientHttpConnector {
private static final Mono<ClientHttpResponse> NO_CLIENT_RESPONSE_ERROR = Mono.error(
new IllegalStateException("HttpClient completed without a response. " +
"As a temporary workaround try to disable connection pool. " +
"See https://github.com/reactor/reactor-netty/issues/138."));
private final HttpClient httpClient;
@ -78,8 +72,7 @@ public class ReactorClientHttpConnector implements ClientHttpConnector {
.request(adaptHttpMethod(method),
uri.toString(),
request -> requestCallback.apply(adaptRequest(method, uri, request)))
.map(this::adaptResponse)
.switchIfEmpty(NO_CLIENT_RESPONSE_ERROR);
.map(this::adaptResponse);
}
private io.netty.handler.codec.http.HttpMethod adaptHttpMethod(HttpMethod method) {