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

Use Bismut-BUILD-SNAPSHOT 

Sync 3.1.0.BUILD-SNAPSHOT changes to Operators.checkRequest (removed)
This commit is contained in:
Stephane Maldini 2017-08-03 14:30:08 -07:00
parent c4f7ff04dc
commit 2677bab560
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -83,7 +83,7 @@ configure(allprojects) { project ->
ext.poiVersion = "3.16"
ext.protobufVersion = "3.3.1"
ext.quartzVersion = "2.3.0"
ext.reactorVersion = "Bismuth-M3"
ext.reactorVersion = "Bismuth-BUILD-SNAPSHOT"
ext.romeVersion = "1.7.4"
ext.rxjavaVersion = '1.3.0'
ext.rxjavaAdapterVersion = '1.2.1'

6
spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java
View File

@ -222,7 +222,7 @@ public abstract class AbstractListenerReadPublisher<T> implements Publisher<T> {
NO_DEMAND {
@Override
<T> void request(AbstractListenerReadPublisher<T> publisher, long n) {
if (Operators.checkRequest(n, publisher.subscriber)) {
if (Operators.validate(n)) {
Operators.addAndGet(DEMAND_FIELD_UPDATER, publisher, n);
if (publisher.changeState(this, DEMAND)) {
publisher.checkOnDataAvailable();
@ -240,7 +240,7 @@ public abstract class AbstractListenerReadPublisher<T> implements Publisher<T> {
DEMAND {
@Override
<T> void request(AbstractListenerReadPublisher<T> publisher, long n) {
if (Operators.checkRequest(n, publisher.subscriber)) {
if (Operators.validate(n)) {
Operators.addAndGet(DEMAND_FIELD_UPDATER, publisher, n);
}
}
@ -268,7 +268,7 @@ public abstract class AbstractListenerReadPublisher<T> implements Publisher<T> {
READING {
@Override
<T> void request(AbstractListenerReadPublisher<T> publisher, long n) {
if (Operators.checkRequest(n, publisher.subscriber)) {
if (Operators.validate(n)) {
Operators.addAndGet(DEMAND_FIELD_UPDATER, publisher, n);
}
}

2
spring-web/src/main/java/org/springframework/http/server/reactive/WriteResultPublisher.java
View File

@ -150,7 +150,7 @@ class WriteResultPublisher implements Publisher<Void> {
SUBSCRIBED {
@Override
void request(WriteResultPublisher publisher, long n) {
Operators.checkRequest(n, publisher.subscriber);
Operators.validate(n);
}
@Override
void publishComplete(WriteResultPublisher publisher) {