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

Merge branch '5.2.x'

This commit is contained in:
Sam Brannen 2020-05-10 15:44:57 +02:00
parent 613bd3be1d 50a4fdac6e
commit 3f30dcae80
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java
View File

@ -67,12 +67,7 @@ public class SimpleThreadScope implements Scope {
@Override @Override
public Object get(String name, ObjectFactory<?> objectFactory) { public Object get(String name, ObjectFactory<?> objectFactory) {
Map<String, Object> scope = this.threadScope.get(); Map<String, Object> scope = this.threadScope.get();
Object scopedObject = scope.get(name); return scope.computeIfAbsent(name, k -> objectFactory.getObject());
if (scopedObject == null) {
scopedObject = objectFactory.getObject();
scope.put(name, scopedObject);
}
return scopedObject;
} }
@Override @Override

7
spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionScope.java
View File

@ -50,12 +50,7 @@ public class SimpleTransactionScope implements Scope {
TransactionSynchronizationManager.registerSynchronization(new CleanupSynchronization(scopedObjects)); TransactionSynchronizationManager.registerSynchronization(new CleanupSynchronization(scopedObjects));
TransactionSynchronizationManager.bindResource(this, scopedObjects); TransactionSynchronizationManager.bindResource(this, scopedObjects);
} }
Object scopedObject = scopedObjects.scopedInstances.get(name); return scopedObjects.scopedInstances.computeIfAbsent(name, k -> objectFactory.getObject());
if (scopedObject == null) {
scopedObject = objectFactory.getObject();
scopedObjects.scopedInstances.put(name, scopedObject);
}
return scopedObject;
} }
@Override @Override