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

Nullability refinements

Browse Source 
See gh-32475
This commit is contained in:
Juergen Hoeller
2024-03-18 15:49:20 +01:00
parent ccebaa6b0c
commit 2f2c4188e5
2 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-core/src/main/java/org/springframework/core/SimpleAliasRegistry.java
View File

@@ -163,6 +163,7 @@ public class SimpleAliasRegistry implements AliasRegistry {
List<String> aliasNamesCopy = new ArrayList<>(this.aliasNames); List<String> aliasNamesCopy = new ArrayList<>(this.aliasNames);
aliasNamesCopy.forEach(alias -> { aliasNamesCopy.forEach(alias -> {
String registeredName = this.aliasMap.get(alias); String registeredName = this.aliasMap.get(alias);
if (registeredName != null) {
String resolvedAlias = valueResolver.resolveStringValue(alias); String resolvedAlias = valueResolver.resolveStringValue(alias);
String resolvedName = valueResolver.resolveStringValue(registeredName); String resolvedName = valueResolver.resolveStringValue(registeredName);
if (resolvedAlias == null || resolvedName == null || resolvedAlias.equals(resolvedName)) { if (resolvedAlias == null || resolvedName == null || resolvedAlias.equals(resolvedName)) {
@@ -193,6 +194,7 @@ public class SimpleAliasRegistry implements AliasRegistry {
this.aliasMap.put(alias, resolvedName); this.aliasMap.put(alias, resolvedName);
this.aliasNames.add(alias); this.aliasNames.add(alias);
} }
}
}); });
} }
} }

2
spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
View File

@@ -754,7 +754,7 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
throws IOException { throws IOException {
String jarFileUrl = null; String jarFileUrl = null;
String rootEntryPath = null; String rootEntryPath = "";
String urlFile = rootDirUrl.getFile(); String urlFile = rootDirUrl.getFile();
int separatorIndex = urlFile.indexOf(ResourceUtils.WAR_URL_SEPARATOR); int separatorIndex = urlFile.indexOf(ResourceUtils.WAR_URL_SEPARATOR);