Merge #2742 into 2.0.0-M4

reactor · Mar 24, 2023 · b00cede · b00cede
2 parents 24154ec + 0cfc731
commit b00cede
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/reactor-netty5-core/src/main/java/reactor/netty5/transport/ServerTransport.java b/reactor-netty5-core/src/main/java/reactor/netty5/transport/ServerTransport.java
@@ -546,6 +546,9 @@ public final void dispose() {
 
 		@Override
 		public void disposeNow(Duration timeout) {
+			if (log.isDebugEnabled()) {
+				log.debug(format(channel(), "Server is about to be disposed with timeout: {}"), timeout);
+			}
 			if (isDisposed()) {
 				return;
 			}
@@ -570,12 +573,17 @@ public void disposeNow(Duration timeout) {
 					Channel channel = entry.getKey();
 					List<Mono<Void>> monos = entry.getValue();
 					if (monos.isEmpty()) {
-						//"FutureReturnValueIgnored" this is deliberate
+						// At this point there are no running requests for this channel
+						// "FutureReturnValueIgnored" this is deliberate
 						channel.close();
 					}
 					else {
-						//"FutureReturnValueIgnored" this is deliberate
-						terminateSignals = Mono.when(monos).doFinally(sig -> channel.close()).and(terminateSignals);
+						terminateSignals =
+								Mono.when(monos)
+								    // At this point there are no running requests for this channel
+								    // "FutureReturnValueIgnored" this is deliberate
+								    .doFinally(sig -> channel.close())
+								    .and(terminateSignals);
 					}
 				}
 			}