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

SimpleAliasRegistry fully synchronizes registerAlias and removeAlias 

Issue: SPR-16577
This commit is contained in:
Juergen Hoeller 2018-03-12 13:27:48 +01:00
parent 42b4f6e1ff
commit 1b1a69a144
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2018 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.
@ -45,23 +45,25 @@ public class SimpleAliasRegistry implements AliasRegistry {
public void registerAlias(String name, String alias) { public void registerAlias(String name, String alias) {
Assert.hasText(name, "'name' must not be empty"); Assert.hasText(name, "'name' must not be empty");
Assert.hasText(alias, "'alias' must not be empty"); Assert.hasText(alias, "'alias' must not be empty");
if (alias.equals(name)) { synchronized (this.aliasMap) {
this.aliasMap.remove(alias); if (alias.equals(name)) {
} this.aliasMap.remove(alias);
else { }
String registeredName = this.aliasMap.get(alias); else {
if (registeredName != null) { String registeredName = this.aliasMap.get(alias);
if (registeredName.equals(name)) { if (registeredName != null) {
// An existing alias - no need to re-register if (registeredName.equals(name)) {
return; // An existing alias - no need to re-register
} return;
if (!allowAliasOverriding()) { }
throw new IllegalStateException("Cannot register alias '" + alias + "' for name '" + if (!allowAliasOverriding()) {
name + "': It is already registered for name '" + registeredName + "'."); throw new IllegalStateException("Cannot register alias '" + alias + "' for name '" +
} name + "': It is already registered for name '" + registeredName + "'.");
}
}
checkForAliasCircle(name, alias);
this.aliasMap.put(alias, name);
} }
checkForAliasCircle(name, alias);
this.aliasMap.put(alias, name);
} }
} }
@ -92,9 +94,11 @@ public class SimpleAliasRegistry implements AliasRegistry {
@Override @Override
public void removeAlias(String alias) { public void removeAlias(String alias) {
String name = this.aliasMap.remove(alias); synchronized (this.aliasMap) {
if (name == null) { String name = this.aliasMap.remove(alias);
throw new IllegalStateException("No alias '" + alias + "' registered"); if (name == null) {
throw new IllegalStateException("No alias '" + alias + "' registered");
}
} }
} }