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

Update eviction queue before size 

See gh-25298
This commit is contained in:
Rossen Stoyanchev 2020-07-16 17:23:24 +03:00
parent 44f1f94f97
commit b451379c2f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-messaging/src/main/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistry.java
View File

@ -263,8 +263,9 @@ public class DefaultSubscriptionRegistry extends AbstractSubscriptionRegistry {
if (sessionIdToSubscriptionIds == null) { if (sessionIdToSubscriptionIds == null) {
sessionIdToSubscriptionIds = this.destinationCache.computeIfAbsent(destination, _destination -> { sessionIdToSubscriptionIds = this.destinationCache.computeIfAbsent(destination, _destination -> {
LinkedMultiValueMap<String, String> matches = computeMatchingSubscriptions(destination); LinkedMultiValueMap<String, String> matches = computeMatchingSubscriptions(destination);
this.cacheSize.incrementAndGet(); // Update queue first, so that cacheSize <= queue.size(
this.cacheEvictionPolicy.add(destination); this.cacheEvictionPolicy.add(destination);
this.cacheSize.incrementAndGet();
return matches; return matches;
}); });
ensureCacheLimit(); ensureCacheLimit();
@ -309,7 +310,9 @@ public class DefaultSubscriptionRegistry extends AbstractSubscriptionRegistry {
if (size > cacheLimit) { if (size > cacheLimit) {
do { do {
if (this.cacheSize.compareAndSet(size, size - 1)) { if (this.cacheSize.compareAndSet(size, size - 1)) {
this.destinationCache.remove(this.cacheEvictionPolicy.poll()); // Remove (vs poll): we expect an element
String head = this.cacheEvictionPolicy.remove();
this.destinationCache.remove(head);
} }
} while ((size = this.cacheSize.get()) > cacheLimit); } while ((size = this.cacheSize.get()) > cacheLimit);
} }