Browse Source

Use .equals to Compare Methods

Closes gh-17143
pull/17148/head
Josh Cummings 8 months ago
parent
commit
bf2aaa1b18
No known key found for this signature in database
GPG Key ID: 869B37A20E876129
  1. 4
      aspects/src/test/java/org/springframework/security/authorization/method/aspectj/PreAuthorizeAspectTests.java
  2. 4
      core/src/main/java/org/springframework/security/core/annotation/UniqueSecurityAnnotationScanner.java

4
aspects/src/test/java/org/springframework/security/authorization/method/aspectj/PreAuthorizeAspectTests.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 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.
@ -144,7 +144,7 @@ public class PreAuthorizeAspectTests { @@ -144,7 +144,7 @@ public class PreAuthorizeAspectTests {
protected void protectedMethod() {
}
@PreAuthorize("hasRole('X')")
@PreAuthorize("hasRole('A')")
void publicCallsPrivate() {
privateMethod();
}

4
core/src/main/java/org/springframework/security/core/annotation/UniqueSecurityAnnotationScanner.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 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.
@ -214,7 +214,7 @@ final class UniqueSecurityAnnotationScanner<A extends Annotation> extends Abstra @@ -214,7 +214,7 @@ final class UniqueSecurityAnnotationScanner<A extends Annotation> extends Abstra
private static Method findMethod(Method method, Class<?> targetClass) {
for (Method candidate : targetClass.getDeclaredMethods()) {
if (candidate == method) {
if (candidate.equals(method)) {
return candidate;
}
if (isOverride(method, candidate)) {

Loading…
Cancel
Save