Fix TODO in ReactorHttpServer

spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/ReactorHttpServer.java

@@ -16,6 +16,8 @@
 
 package org.springframework.http.server.reactive.bootstrap;
 
+import java.util.concurrent.atomic.AtomicReference;
+
 import reactor.core.Loopback;
 import reactor.ipc.netty.NettyContext;
 
@@ -31,7 +33,7 @@ public class ReactorHttpServer extends HttpServerSupport implements HttpServer,
 
 	private reactor.ipc.netty.http.server.HttpServer reactorServer;
 
-	private NettyContext running;
+	private AtomicReference<NettyContext> nettyContext = new AtomicReference<>();
 
 
 	@Override
@@ -43,42 +45,39 @@ public class ReactorHttpServer extends HttpServerSupport implements HttpServer,
 			Assert.notNull(getHttpHandler());
 			this.reactorHandler = new ReactorHttpHandlerAdapter(getHttpHandler());
 		}
-		this.reactorServer = reactor.ipc.netty.http.server.HttpServer.create(getHost(),
+		this.reactorServer = reactor.ipc.netty.http.server.HttpServer
-				getPort());
+				.create(getHost(), getPort());
 	}
 
 
 	@Override
 	public boolean isRunning() {
-		NettyContext running = this.running;
+		NettyContext context = this.nettyContext.get();
-		return running != null && running.channel()
+		return (context != null && context.channel().isActive());
-		                                 .isActive();
 	}
 
 	@Override
 	public Object connectedInput() {
-		return reactorServer;
+		return this.reactorServer;
 	}
 
 	@Override
 	public Object connectedOutput() {
-		return reactorServer;
+		return this.reactorServer;
 	}
 
 	@Override
 	public void start() {
-		// TODO: should be made thread-safe (compareAndSet..)
+		if (this.nettyContext.get() == null) {
-		if (this.running == null) {
+			this.nettyContext.set(this.reactorServer.newHandler(reactorHandler).block());
-			this.running = this.reactorServer.newHandler(reactorHandler).block();
 		}
 	}
 
 	@Override
 	public void stop() {
-		NettyContext running = this.running;
+		NettyContext context = this.nettyContext.getAndSet(null);
-		if (running != null) {
+		if (context != null) {
-			this.running = null;
+			context.dispose();
-			running.dispose();
 		}
 	}
 }