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

Switch to Reactor Dysprosium snapshots 

See gh-25376
This commit is contained in:
Rossen Stoyanchev 2020-07-13 16:51:09 +03:00
parent b769b73960
commit 03fa48919e
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle
View File

@ -28,7 +28,7 @@ configure(allprojects) { project ->
imports { imports {
mavenBom "com.fasterxml.jackson:jackson-bom:2.10.4" mavenBom "com.fasterxml.jackson:jackson-bom:2.10.4"
mavenBom "io.netty:netty-bom:4.1.50.Final" mavenBom "io.netty:netty-bom:4.1.50.Final"
mavenBom "io.projectreactor:reactor-bom:Dysprosium-SR8" mavenBom "io.projectreactor:reactor-bom:Dysprosium-BUILD-SNAPSHOT"
mavenBom "io.rsocket:rsocket-bom:1.0.1" mavenBom "io.rsocket:rsocket-bom:1.0.1"
mavenBom "org.eclipse.jetty:jetty-bom:9.4.30.v20200611" mavenBom "org.eclipse.jetty:jetty-bom:9.4.30.v20200611"
mavenBom "org.jetbrains.kotlin:kotlin-bom:1.3.72" mavenBom "org.jetbrains.kotlin:kotlin-bom:1.3.72"
@ -279,6 +279,7 @@ configure(allprojects) { project ->
repositories { repositories {
mavenCentral() mavenCentral()
maven { url "https://repo.spring.io/libs-spring-framework-build" } maven { url "https://repo.spring.io/libs-spring-framework-build" }
maven { url "https://repo.spring.io/snapshot" } // Reactor
} }
} }
configurations.all { configurations.all {

21
spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java
View File

@ -34,7 +34,6 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseCookie; import org.springframework.http.ResponseCookie;
import org.springframework.lang.Nullable;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
@ -51,18 +50,17 @@ class ReactorClientHttpResponse implements ClientHttpResponse {
private static final Log logger = LogFactory.getLog(ReactorClientHttpResponse.class); private static final Log logger = LogFactory.getLog(ReactorClientHttpResponse.class);
private final NettyDataBufferFactory bufferFactory;
private final HttpClientResponse response; private final HttpClientResponse response;
private final NettyInbound inbound; private final NettyInbound inbound;
@Nullable private final NettyDataBufferFactory bufferFactory;
private final String logPrefix;
// 0 - not subscribed, 1 - subscribed, 2 - cancelled, 3 - cancelled via connector (before subscribe) // 0 - not subscribed, 1 - subscribed, 2 - cancelled via connector (before subscribe)
private final AtomicInteger state = new AtomicInteger(0); private final AtomicInteger state = new AtomicInteger(0);
private final String logPrefix;
/** /**
* Constructor that matches the inputs from * Constructor that matches the inputs from
@ -96,20 +94,11 @@ class ReactorClientHttpResponse implements ClientHttpResponse {
if (this.state.compareAndSet(0, 1)) { if (this.state.compareAndSet(0, 1)) {
return; return;
} }
// https://github.com/reactor/reactor-netty/issues/503
// FluxReceive rejects multiple subscribers, but not after a cancel().
// Subsequent subscribers after cancel() will not be rejected, but will hang instead.
// So we need to reject once in cancelled state.
if (this.state.get() == 2) { if (this.state.get() == 2) {
throw new IllegalStateException(
"The client response body can only be consumed once.");
}
else if (this.state.get() == 3) {
throw new IllegalStateException( throw new IllegalStateException(
"The client response body has been released already due to cancellation."); "The client response body has been released already due to cancellation.");
} }
}) })
.doOnCancel(() -> this.state.compareAndSet(1, 2))
.map(byteBuf -> { .map(byteBuf -> {
byteBuf.retain(); byteBuf.retain();
return this.bufferFactory.wrap(byteBuf); return this.bufferFactory.wrap(byteBuf);
@ -157,7 +146,7 @@ class ReactorClientHttpResponse implements ClientHttpResponse {
* reading was delayed for some reason. * reading was delayed for some reason.
*/ */
void releaseAfterCancel(HttpMethod method) { void releaseAfterCancel(HttpMethod method) {
if (mayHaveBody(method) && this.state.compareAndSet(0, 3)) { if (mayHaveBody(method) && this.state.compareAndSet(0, 2)) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug(this.logPrefix + "Releasing body, not yet subscribed."); logger.debug(this.logPrefix + "Releasing body, not yet subscribed.");
} }