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

Attempt to fix ConcurrentModificationException

Browse Source 
Attempt to fix `ConcurrentModificationException` which occurs on
Java 11+.

See gh-23326
This commit is contained in:
Phillip Webb
2020-09-17 01:41:39 -07:00
parent cad079ce7d
commit 99dc7914b2
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/DefaultBootstrapContext.java
View File

@@ -88,7 +88,12 @@ public class DefaultBootstrapContext implements ConfigurableBootstrapContext {
synchronized (this.instanceSuppliers) {
InstanceSupplier<?> instanceSupplier = this.instanceSuppliers.get(type);
Assert.state(instanceSupplier != null, () -> type.getName() + " has not been registered");
return (T) this.instances.computeIfAbsent(type, (key) -> instanceSupplier.get(this));
T instance = (T) this.instances.get(type);
if (instance == null) {
instance = (T) instanceSupplier.get(this);
this.instances.put(type, instance);
}
return instance;
}
}