From ff03b4a4adbaf4a2e05f6163584379a1335706d7 Mon Sep 17 00:00:00 2001
From: Violeta Georgieva <vgeorgieva@pivotal.io>
Date: Thu, 6 Apr 2017 22:06:20 +0300
Subject: [PATCH] Init subscriber before switching the states

Issue: SPR-15418
---
 .../http/server/reactive/WriteResultPublisher.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ed9e0a030b..cd9b59a7cd 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
@@ -116,9 +116,9 @@ class WriteResultPublisher implements Publisher<Void> {
 			@Override
 			void subscribe(WriteResultPublisher publisher, Subscriber<? super Void> subscriber) {
 				Assert.notNull(subscriber, "Subscriber must not be null");
+				publisher.subscriber = subscriber;
 				if (publisher.changeState(this, SUBSCRIBED)) {
 					Subscription subscription = new ResponseBodyWriteResultSubscription(publisher);
-					publisher.subscriber = subscriber;
 					subscriber.onSubscribe(subscription);
 					if (publisher.publisherCompleted) {
 						publisher.publishComplete();
-- 
GitLab