Merge branch 'multi-logout-handler-webflux' of github.com:blake-bauman/spring-security into multi-logout-handler-webflux

blake-bauman · blake-bauman · commit 2581a1938341 · 2025-09-02T16:46:03.000-07:00
diff --git a/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java b/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java
@@ -3105,7 +3105,7 @@ private ServerLogoutHandler createLogoutHandler() {
 				this.DEFAULT_LOGOUT_HANDLER.setSecurityContextRepository(securityContextRepository);
 			}
 			if (this.logoutHandlers.isEmpty()) {
-				return null;
+				return this.DEFAULT_LOGOUT_HANDLER;
 			}
 			if (this.logoutHandlers.size() == 1) {
 				return this.logoutHandlers.get(0);

Original file line number	Diff line number	Diff line change
`@@ -3105,7 +3105,7 @@ private ServerLogoutHandler createLogoutHandler() {`
`3105`	`3105`	`this.DEFAULT_LOGOUT_HANDLER.setSecurityContextRepository(securityContextRepository);`
`3106`	`3106`	`}`
`3107`	`3107`	`if (this.logoutHandlers.isEmpty()) {`
`3108`		`- return null;`
	`3108`	`+ return this.DEFAULT_LOGOUT_HANDLER;`
`3109`	`3109`	`}`
`3110`	`3110`	`if (this.logoutHandlers.size() == 1) {`
`3111`	`3111`	`return this.logoutHandlers.get(0);`