Fix EvaluationContextExtension filter fall-through in ReactiveExtensionAwareEvaluationContextProvider.

dsbecker · mp911de · commit 90a50d4d823e · 2021-07-12T15:47:20.000+02:00
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.
diff --git a/src/main/java/org/springframework/data/spel/ReactiveExtensionAwareEvaluationContextProvider.java b/src/main/java/org/springframework/data/spel/ReactiveExtensionAwareEvaluationContextProvider.java
@@ -125,6 +125,8 @@ private Mono<List<EvaluationContextExtension>> getExtensions(
 				if (extensionFilter.test(information)) {
 					return Mono.just(extension);
 				}
+
+				return Mono.empty();
 			}
 
 			if (it instanceof ReactiveEvaluationContextExtension) {

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,8 @@ private Mono<List<EvaluationContextExtension>> getExtensions(`
`125`	`125`	`if (extensionFilter.test(information)) {`
`126`	`126`	`return Mono.just(extension);`
`127`	`127`	`}`
	`128`	`+`
	`129`	`+ return Mono.empty();`
`128`	`130`	`}`
`129`	`131`
`130`	`132`	`if (it instanceof ReactiveEvaluationContextExtension) {`