Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

Browse Source
This commit is contained in:
Sam Brannen
2024-11-03 16:17:43 +01:00
parent 2b601f9e51 6bd4687706
commit e3301dd1c4
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
View File

@@ -479,8 +479,8 @@ public abstract class AbstractHandlerMethodMapping<T> extends AbstractHandlerMap
@Override
protected boolean hasCorsConfigurationSource(Object handler) {
return super.hasCorsConfigurationSource(handler) ||
(handler instanceof HandlerMethod handerMethod &&
this.mappingRegistry.getCorsConfiguration(handerMethod) != null);
(handler instanceof HandlerMethod handlerMethod &&
this.mappingRegistry.getCorsConfiguration(handlerMethod) != null);
}
@Override