From e15ca514c87f38e0dd5374b12a31b557f78a5140 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Tue, 24 Jul 2018 13:56:51 +0200 Subject: [PATCH] Update HttpResources cleaning for Reactor Netty This commit updates the workaround for issue gh-9146 --- .../boot/web/embedded/netty/NettyWebServer.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyWebServer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyWebServer.java index 9ba693a3b0..7191dcf44a 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyWebServer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyWebServer.java @@ -115,15 +115,14 @@ public class NettyWebServer implements WebServer { @Override public void stop() throws WebServerException { if (this.disposableServer != null) { - // temporary fix for gh-9146 - this.disposableServer.onDispose() - .doFinally((signal) -> HttpResources.reset()); if (this.lifecycleTimeout != null) { this.disposableServer.disposeNow(this.lifecycleTimeout); } else { this.disposableServer.disposeNow(); } + // temporary fix for gh-9146 + HttpResources.shutdown(); this.disposableServer = null; } }