From 24bea93882b19b357c3e873aa1cc9c3958fd5a91 Mon Sep 17 00:00:00 2001 From: Pierre De Rop Date: Mon, 13 Nov 2023 19:14:12 +0100 Subject: [PATCH 1/2] Update micrometer and micrometerTracing (#3636) For preparation of upcoming reactor-core version 3.5.12, we need to update Micrometer to 1.10.13 and micrometerTracingTest to 1.0.12 --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0343893154..4b88eec9f2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,9 +14,9 @@ baselinePerfExtra = "3.5.1" # Other shared versions asciidoctor = "3.3.2" #note that some micrometer artifacts like context-propagation has a different version directly set in libraries below -micrometer = "1.10.12" +micrometer = "1.10.13" micrometerDocsGenerator = "1.0.2" -micrometerTracingTest="1.0.11" +micrometerTracingTest="1.0.12" contextPropagation="1.0.6" kotlin = "1.5.32" reactiveStreams = "1.0.4" From 9e9649c030f35b5aceed14261e96db16f8c87ef3 Mon Sep 17 00:00:00 2001 From: Oleh Dokuka <5380167+OlegDokuka@users.noreply.github.com> Date: Mon, 13 Nov 2023 21:45:00 +0200 Subject: [PATCH 2/2] makes `throwable` assignment HB `done` assignment in `onError` (#3638) Signed-off-by: Oleh Dokuka --- .../src/main/java/reactor/core/publisher/FluxPublish.java | 4 +++- 1 file changed, 3 insertions(+), 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 index ef0d7587bf..b3211b1200 100644 --- a/reactor-core/src/main/java/reactor/core/publisher/FluxPublish.java +++ b/reactor-core/src/main/java/reactor/core/publisher/FluxPublish.java @@ -316,11 +316,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;