Merge #3638 into 3.6.0

Signed-off-by: Oleh Dokuka <odokuka@vmware.com>
reactor · Nov 13, 2023 · 028dfa5 · 028dfa5
2 parents 00a814b + 9e9649c
commit 028dfa5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/reactor-core/src/main/java/reactor/core/publisher/FluxPublish.java b/reactor-core/src/main/java/reactor/core/publisher/FluxPublish.java
@@ -317,11 +317,13 @@ public void onError(Throwable t) {
 				return;
 			}
 
-			done = true;
 			if (!Exceptions.addThrowable(ERROR, this, t)) {
 				Operators.onErrorDroppedMulticast(t, subscribers);
+				return;
 			}
 
+			done = true;
+
 			long previousState = markTerminated(this);
 			if (isTerminated(previousState) || isCancelled(previousState)) {
 				return;