From 95e115b357854d1baf85f9d4e0026e3b255c2d96 Mon Sep 17 00:00:00 2001 From: David Becker Date: Thu, 24 Jun 2021 15:29:36 -0700 Subject: [PATCH] Fix EvaluationContextExtension filter fall-through in ReactiveExtensionAwareEvaluationContextProvider. Using JpaEvaluationContextExtension with reactive infrastructure in place, ReactiveExtensionAwareEvaluationContextProvider can lead to IllegalStateException if the desired extension doesn't match the predicate instead of being silently dropped. Closes #2392 Original pull request: #2393. --- .../spel/ReactiveExtensionAwareEvaluationContextProvider.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/springframework/data/spel/ReactiveExtensionAwareEvaluationContextProvider.java b/src/main/java/org/springframework/data/spel/ReactiveExtensionAwareEvaluationContextProvider.java index 44ea5e836..a42ec8bc0 100644 --- a/src/main/java/org/springframework/data/spel/ReactiveExtensionAwareEvaluationContextProvider.java +++ b/src/main/java/org/springframework/data/spel/ReactiveExtensionAwareEvaluationContextProvider.java @@ -125,6 +125,8 @@ public class ReactiveExtensionAwareEvaluationContextProvider implements Reactive if (extensionFilter.test(information)) { return Mono.just(extension); } + + return Mono.empty(); } if (it instanceof ReactiveEvaluationContextExtension) {