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

DATACMNS-1735 - Polishing.

Browse Source 
Use mutated object as guard for synchronization. Copy discovered callbacks to cached callbacks.

Reduce concurrency in unit test to reduce test load. Guard synchronization with timeouts.

Original pull request: #446.
This commit is contained in:
Mark Paluch
2020-05-27 09:31:03 +02:00
parent d9969cb7d4
commit fbe51ef1bb
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/springframework/data/mapping/callback/EntityCallbackDiscoverer.java
View File

@@ -384,10 +384,11 @@ class EntityCallbackDiscoverer {
if (this.entityCallbackBeans.isEmpty()) {
if (cachedEntityCallbacks.size() != entityCallbacks.size()) {
List<EntityCallback<?>> entityCallbacks = new ArrayList<>(this.entityCallbacks.size());
List<EntityCallback<?>> entityCallbacks = new ArrayList<>(this.entityCallbacks);
AnnotationAwareOrderComparator.sort(entityCallbacks);
synchronized(this) {
synchronized (cachedEntityCallbacks) {
cachedEntityCallbacks.clear();
cachedEntityCallbacks.addAll(entityCallbacks);
}