Merge branch '5.3.x'
This commit is contained in:
commit
2ccfc7068e
|
@ -209,6 +209,7 @@ final class PartGenerator extends BaseSubscriber<MultipartParser.Token> {
|
||||||
|
|
||||||
void requestToken() {
|
void requestToken() {
|
||||||
if (upstream() != null &&
|
if (upstream() != null &&
|
||||||
|
this.state.get().canRequest() &&
|
||||||
this.requestOutstanding.compareAndSet(false, true)) {
|
this.requestOutstanding.compareAndSet(false, true)) {
|
||||||
request(1);
|
request(1);
|
||||||
}
|
}
|
||||||
|
@ -252,6 +253,13 @@ final class PartGenerator extends BaseSubscriber<MultipartParser.Token> {
|
||||||
default void error(Throwable throwable) {
|
default void error(Throwable throwable) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Indicates whether the current state is ready to accept a new token.
|
||||||
|
*/
|
||||||
|
default boolean canRequest() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Cleans up any state.
|
* Cleans up any state.
|
||||||
*/
|
*/
|
||||||
|
@ -755,6 +763,11 @@ final class PartGenerator extends BaseSubscriber<MultipartParser.Token> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean canRequest() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void dispose() {
|
public void dispose() {
|
||||||
this.disposed = true;
|
this.disposed = true;
|
||||||
|
|
Loading…
Reference in New Issue