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

SimpleAliasRegistry prevents NPE for alias resolved to null

Browse Source 
Issue: SPR-13016
This commit is contained in:
Juergen Hoeller
2015-05-12 22:04:44 +02:00
parent 281588d7bb
commit e83d495cbb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2015 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.
@@ -122,7 +122,7 @@ public class SimpleAliasRegistry implements AliasRegistry {
String registeredName = aliasCopy.get(alias); String registeredName = aliasCopy.get(alias);
String resolvedAlias = valueResolver.resolveStringValue(alias); String resolvedAlias = valueResolver.resolveStringValue(alias);
String resolvedName = valueResolver.resolveStringValue(registeredName); String resolvedName = valueResolver.resolveStringValue(registeredName);
if (resolvedAlias.equals(resolvedName)) { if (resolvedAlias == null || resolvedName == null || resolvedAlias.equals(resolvedName)) {
this.aliasMap.remove(alias); this.aliasMap.remove(alias);
} }
else if (!resolvedAlias.equals(alias)) { else if (!resolvedAlias.equals(alias)) {