Merge branch '5.8.x' into 6.1.x

jzheaux · jzheaux · commit 2fdd541ea53d · 2024-02-22T12:15:00.000-07:00
Closes gh-14647
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -335,7 +335,6 @@ private LogoutFilter createLogoutFilter(H http) {
 		LogoutFilter result = new LogoutFilter(getLogoutSuccessHandler(), handlers);
 		result.setSecurityContextHolderStrategy(getSecurityContextHolderStrategy());
 		result.setLogoutRequestMatcher(getLogoutRequestMatcher(http));
-		result.setSecurityContextHolderStrategy(getSecurityContextHolderStrategy());
 		result = postProcess(result);
 		return result;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2023 the original author or authors.`
	`2`	`+ * Copyright 2002-2024 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -335,7 +335,6 @@ private LogoutFilter createLogoutFilter(H http) {`
`335`	`335`	`LogoutFilter result = new LogoutFilter(getLogoutSuccessHandler(), handlers);`
`336`	`336`	`result.setSecurityContextHolderStrategy(getSecurityContextHolderStrategy());`
`337`	`337`	`result.setLogoutRequestMatcher(getLogoutRequestMatcher(http));`
`338`		`- result.setSecurityContextHolderStrategy(getSecurityContextHolderStrategy());`
`339`	`338`	`result = postProcess(result);`
`340`	`339`	`return result;`
`341`	`340`	`}`