From 39ba753d80fa5178c4492ef9bdd150271f0424ad Mon Sep 17 00:00:00 2001 From: Ismail Alammar Date: Mon, 28 Mar 2022 19:39:38 +0800 Subject: [PATCH] log class name in FluxMapFuseable if mapper returns null --- .../src/main/java/reactor/core/publisher/FluxMap.java | 2 +- .../main/java/reactor/core/publisher/FluxMapFuseable.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reactor-core/src/main/java/reactor/core/publisher/FluxMap.java b/reactor-core/src/main/java/reactor/core/publisher/FluxMap.java index a0196b21df..9ee2f93ee2 100644 --- a/reactor-core/src/main/java/reactor/core/publisher/FluxMap.java +++ b/reactor-core/src/main/java/reactor/core/publisher/FluxMap.java @@ -104,7 +104,7 @@ public void onNext(T t) { try { v = Objects.requireNonNull(mapper.apply(t), - "The mapper returned a null value."); + "The mapper [" + mapper.getClass().getName() + "] returned a null value."); } catch (Throwable e) { Throwable e_ = Operators.onNextError(t, e, actual.currentContext(), s); diff --git a/reactor-core/src/main/java/reactor/core/publisher/FluxMapFuseable.java b/reactor-core/src/main/java/reactor/core/publisher/FluxMapFuseable.java index 2d8db3d10b..c19f4b49de 100644 --- a/reactor-core/src/main/java/reactor/core/publisher/FluxMapFuseable.java +++ b/reactor-core/src/main/java/reactor/core/publisher/FluxMapFuseable.java @@ -111,7 +111,7 @@ public void onNext(T t) { try { v = Objects.requireNonNull(mapper.apply(t), - "The mapper returned a null value."); + "The mapper [" + mapper.getClass().getName() + "] returned a null value."); } catch (Throwable e) { Throwable e_ = Operators.onNextError(t, e, actual.currentContext(), s); @@ -279,7 +279,7 @@ public void onNext(T t) { try { v = Objects.requireNonNull(mapper.apply(t), - "The mapper returned a null value."); + "The mapper [" + mapper.getClass().getName() + "] returned a null value."); } catch (Throwable e) { Throwable e_ = Operators.onNextError(t, e, actual.currentContext(), s); @@ -307,7 +307,7 @@ public boolean tryOnNext(T t) { try { v = Objects.requireNonNull(mapper.apply(t), - "The mapper returned a null value."); + "The mapper [" + mapper.getClass().getName() + "] returned a null value."); return actual.tryOnNext(v); } catch (Throwable e) {