From 2677bab560ac7f26dc435d6502c1f8fab13200ef Mon Sep 17 00:00:00 2001
From: Stephane Maldini <smaldini@pivotal.io>
Date: Thu, 3 Aug 2017 14:30:08 -0700
Subject: [PATCH] Use Bismut-BUILD-SNAPSHOT Sync 3.1.0.BUILD-SNAPSHOT changes
 to Operators.checkRequest (removed)

---
 build.gradle                                                | 2 +-
 .../http/server/reactive/AbstractListenerReadPublisher.java | 6 +++---
 .../http/server/reactive/WriteResultPublisher.java          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9c0e1c3d85..93d00d681d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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'
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java
index 2d68f30d8e..487a19ff39 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java
@@ -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);
 				}
 			}
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/WriteResultPublisher.java b/spring-web/src/main/java/org/springframework/http/server/reactive/WriteResultPublisher.java
index b087261d79..2a2f3dfdc9 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/WriteResultPublisher.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/WriteResultPublisher.java
@@ -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) {