Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.3.x'

This commit is contained in:
Josh Cummings 2024-08-20 16:47:48 -06:00
parent f1802be73a 0cab7c8f15
commit 4da13f6091
No known key found for this signature in database
GPG Key ID: A306A51F43B8E5A5
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/org/springframework/security/authorization/method/AuthorizationAdvisorProxyFactory.java
View File

@ -159,6 +159,7 @@ public final class AuthorizationAdvisorProxyFactory
*/ */
@Override @Override
public Object proxy(Object target) { public Object proxy(Object target) {
AnnotationAwareOrderComparator.sort(this.advisors);
if (target == null) { if (target == null) {
return null; return null;
} }
@ -185,7 +186,6 @@ public final class AuthorizationAdvisorProxyFactory
@Deprecated @Deprecated
public void setAdvisors(AuthorizationAdvisor... advisors) { public void setAdvisors(AuthorizationAdvisor... advisors) {
this.advisors = new ArrayList<>(List.of(advisors)); this.advisors = new ArrayList<>(List.of(advisors));
AnnotationAwareOrderComparator.sort(this.advisors);
} }
/** /**
@ -199,7 +199,6 @@ public final class AuthorizationAdvisorProxyFactory
@Deprecated @Deprecated
public void setAdvisors(Collection<AuthorizationAdvisor> advisors) { public void setAdvisors(Collection<AuthorizationAdvisor> advisors) {
this.advisors = new ArrayList<>(advisors); this.advisors = new ArrayList<>(advisors);
AnnotationAwareOrderComparator.sort(this.advisors);
} }
/** /**