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

Merge branch '6.1.x'

This commit is contained in:
Stéphane Nicoll 2024-06-11 06:53:22 +02:00
parent 68e6b152ef 6b7f0bd4b6
commit 720b7c1dac
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-core/src/main/java/org/springframework/util/StringUtils.java
View File

@ -72,7 +72,7 @@ public abstract class StringUtils {
private static final String WINDOWS_FOLDER_SEPARATOR = "\\"; private static final String WINDOWS_FOLDER_SEPARATOR = "\\";
private static final String DOUBLE_BACKLASHES = "\\\\"; private static final String DOUBLE_BACKSLASHES = "\\\\";
private static final String TOP_PATH = ".."; private static final String TOP_PATH = "..";
@ -713,7 +713,7 @@ public abstract class StringUtils {
String normalizedPath; String normalizedPath;
// Optimize when there is no backslash // Optimize when there is no backslash
if (path.indexOf('\\') != -1) { if (path.indexOf('\\') != -1) {
normalizedPath = replace(path, DOUBLE_BACKLASHES, FOLDER_SEPARATOR); normalizedPath = replace(path, DOUBLE_BACKSLASHES, FOLDER_SEPARATOR);
normalizedPath = replace(normalizedPath, WINDOWS_FOLDER_SEPARATOR, FOLDER_SEPARATOR); normalizedPath = replace(normalizedPath, WINDOWS_FOLDER_SEPARATOR, FOLDER_SEPARATOR);
} }
else { else {