From 423a4852c57bbf9beb65835b35a9be296c92fb2f Mon Sep 17 00:00:00 2001
From: Stephane Maldini <smaldini@pivotal.io>
Date: Sun, 28 Feb 2016 11:29:46 +0000
Subject: [PATCH] use EmptySubscription

---
 .../server/reactive/WriteWithOperator.java    | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/WriteWithOperator.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/WriteWithOperator.java
index f2c2354a75..72cd43cb57 100644
--- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/WriteWithOperator.java
+++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/WriteWithOperator.java
@@ -22,7 +22,7 @@ import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 import reactor.core.subscriber.SubscriberBarrier;
 import reactor.core.util.Assert;
-
+import reactor.core.util.EmptySubscription;
 
 /**
  * Given a write function that accepts a source {@code Publisher<T>} to write
@@ -36,10 +36,10 @@ import reactor.core.util.Assert;
  */
 public class WriteWithOperator<T> implements Function<Subscriber<? super Void>, Subscriber<? super T>> {
 
-	private final java.util.function.Function<Publisher<T>, Publisher<Void>> writeFunction;
+	private final Function<Publisher<T>, Publisher<Void>> writeFunction;
 
 
-	public WriteWithOperator(java.util.function.Function<Publisher<T>, Publisher<Void>> writeFunction) {
+	public WriteWithOperator(Function<Publisher<T>, Publisher<Void>> writeFunction) {
 		this.writeFunction = writeFunction;
 	}
 
@@ -156,7 +156,7 @@ public class WriteWithOperator<T> implements Function<Subscriber<? super Void>,
 				this.writeSubscriber = writeSubscriber;
 
 				if (this.error != null || this.completed) {
-					this.writeSubscriber.onSubscribe(NO_OP_SUBSCRIPTION);
+					this.writeSubscriber.onSubscribe(EmptySubscription.INSTANCE);
 					emitCachedSignals();
 				}
 				else {
@@ -234,15 +234,4 @@ public class WriteWithOperator<T> implements Function<Subscriber<? super Void>,
 		}
 	}
 
-	private final static Subscription NO_OP_SUBSCRIPTION = new Subscription() {
-
-		@Override
-		public void request(long n) {
-		}
-
-		@Override
-		public void cancel() {
-		}
-	};
-
 }