Skip to content

Commit

Permalink
Switch to Reactor Dysprosium snapshots
Browse files Browse the repository at this point in the history
  • Loading branch information
rstoyanchev authored and xcl(徐程林) committed Aug 16, 2020
1 parent f81eadb commit e7a2f4d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 17 deletions.
3 changes: 2 additions & 1 deletion build.gradle
Expand Up @@ -28,7 +28,7 @@ configure(allprojects) { project ->
imports {
mavenBom "com.fasterxml.jackson:jackson-bom:2.10.4"
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 "org.eclipse.jetty:jetty-bom:9.4.30.v20200611"
mavenBom "org.jetbrains.kotlin:kotlin-bom:1.3.72"
Expand Down Expand Up @@ -279,6 +279,7 @@ configure(allprojects) { project ->
repositories {
mavenCentral()
maven { url "https://repo.spring.io/libs-spring-framework-build" }
maven { url "https://repo.spring.io/snapshot" } // Reactor
}
}
configurations.all {
Expand Down
Expand Up @@ -34,7 +34,6 @@
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseCookie;
import org.springframework.lang.Nullable;
import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
Expand All @@ -51,18 +50,17 @@ class ReactorClientHttpResponse implements ClientHttpResponse {

private static final Log logger = LogFactory.getLog(ReactorClientHttpResponse.class);

private final NettyDataBufferFactory bufferFactory;

private final HttpClientResponse response;

private final NettyInbound inbound;

@Nullable
private final String logPrefix;
private final NettyDataBufferFactory bufferFactory;

// 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 String logPrefix;


/**
* Constructor that matches the inputs from
Expand Down Expand Up @@ -96,20 +94,11 @@ public Flux<DataBuffer> getBody() {
if (this.state.compareAndSet(0, 1)) {
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) {
throw new IllegalStateException(
"The client response body can only be consumed once.");
}
else if (this.state.get() == 3) {
throw new IllegalStateException(
"The client response body has been released already due to cancellation.");
}
})
.doOnCancel(() -> this.state.compareAndSet(1, 2))
.map(byteBuf -> {
byteBuf.retain();
return this.bufferFactory.wrap(byteBuf);
Expand Down Expand Up @@ -157,7 +146,7 @@ public MultiValueMap<String, ResponseCookie> getCookies() {
* reading was delayed for some reason.
*/
void releaseAfterCancel(HttpMethod method) {
if (mayHaveBody(method) && this.state.compareAndSet(0, 3)) {
if (mayHaveBody(method) && this.state.compareAndSet(0, 2)) {
if (logger.isDebugEnabled()) {
logger.debug(this.logPrefix + "Releasing body, not yet subscribed.");
}
Expand Down

0 comments on commit e7a2f4d

Please sign in to comment.