From 6f222609c24a3f00ca662c71bc7d0ea63dbe39e0 Mon Sep 17 00:00:00 2001
From: Violeta Georgieva <vgeorgieva@pivotal.io>
Date: Wed, 23 Nov 2016 23:28:23 +0200
Subject: [PATCH] Fix NPE in
 ServletServerHttpResponse.ResponseBodyProcessor.write

Issue: SPR-14941
---
 .../http/server/reactive/AbstractResponseBodyProcessor.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractResponseBodyProcessor.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractResponseBodyProcessor.java
index d6067383927..f26456ff731 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractResponseBodyProcessor.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractResponseBodyProcessor.java
@@ -221,9 +221,11 @@ abstract class AbstractResponseBodyProcessor implements Processor<DataBuffer, Vo
 				if (dataBuffer.readableByteCount() == 0) {
 					processor.subscription.request(1);
 				}
-				else if (processor.changeState(this, RECEIVED)) {
+				else {
 					processor.receiveBuffer(dataBuffer);
-					processor.writeIfPossible();
+					if (processor.changeState(this, RECEIVED)) {
+						processor.writeIfPossible();
+					}
 				}
 			}