Merge branch '6.1.x' into 6.2.x

This commit is contained in:
Josh Cummings 2023-12-18 15:19:48 -07:00
commit 74860c4aff
No known key found for this signature in database
GPG Key ID: A306A51F43B8E5A5

View File

@ -82,7 +82,7 @@ class ReactiveMethodSecurityConfiguration implements ImportAware {
@Bean @Bean
@Role(BeanDefinition.ROLE_INFRASTRUCTURE) @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
DefaultMethodSecurityExpressionHandler methodSecurityExpressionHandler( static DefaultMethodSecurityExpressionHandler methodSecurityExpressionHandler(
ReactiveMethodSecurityConfiguration configuration) { ReactiveMethodSecurityConfiguration configuration) {
DefaultMethodSecurityExpressionHandler handler = new DefaultMethodSecurityExpressionHandler(); DefaultMethodSecurityExpressionHandler handler = new DefaultMethodSecurityExpressionHandler();
if (configuration.grantedAuthorityDefaults != null) { if (configuration.grantedAuthorityDefaults != null) {