root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

This commit is contained in:
Stephane Nicoll 2023-06-19 15:47:26 +02:00
parent 09cb844421 2b981651e1
commit 83b0f4f394
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -133,6 +133,7 @@ public class PathResourceResolver extends AbstractResourceResolver {
@Override @Override
@Nullable
protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath, protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath,
List<? extends Resource> locations, ResourceResolverChain chain) { List<? extends Resource> locations, ResourceResolverChain chain) {
@ -140,6 +141,7 @@ public class PathResourceResolver extends AbstractResourceResolver {
} }
@Override @Override
@Nullable
protected String resolveUrlPathInternal(String resourcePath, List<? extends Resource> locations, protected String resolveUrlPathInternal(String resourcePath, List<? extends Resource> locations,
ResourceResolverChain chain) { ResourceResolverChain chain) {