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

Merge branch '5.3.x' into main

This commit is contained in:
Rossen Stoyanchev 2021-10-19 12:35:37 +01:00
parent 9804e75051 05ea991d62
commit 22f75d9ea9
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
View File

@ -336,12 +336,6 @@ public class ResourceWebHandler implements WebHandler, InitializingBean {
this.locationsToUse.clear(); this.locationsToUse.clear();
this.locationsToUse.addAll(result); this.locationsToUse.addAll(result);
if (logger.isInfoEnabled()) {
logger.info(!this.locationsToUse.isEmpty() ?
"Locations in use: " + locationToString(this.locationsToUse) :
"0 locations in use.");
}
} }
/** /**

6
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
View File

@ -466,12 +466,6 @@ public class ResourceHttpRequestHandler extends WebContentGenerator
this.locationsToUse.clear(); this.locationsToUse.clear();
this.locationsToUse.addAll(result); this.locationsToUse.addAll(result);
if (logger.isInfoEnabled()) {
logger.info(!this.locationsToUse.isEmpty() ?
"Locations in use: " + locationToString(this.locationsToUse) :
"0 locations in use.");
}
} }
/** /**