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

Match subscriptions to remove by id 

Commit 524ca1a676 unintentionally changed
how subscriptions to be removed are matched. This commit restores that.

See gh-25298
This commit is contained in:
Rossen Stoyanchev 2020-07-22 13:22:29 +03:00
parent 471577a11b
commit f9ba58eab9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,12 +341,13 @@ public class DefaultSubscriptionRegistry extends AbstractSubscriptionRegistry {
public void updateAfterRemovedSubscription(String sessionId, Subscription subscription) {
if (subscription.isPattern()) {
String patternDestination = subscription.getDestination();
for (String destination : this.destinationCache.keySet()) {
if (pathMatcher.match(patternDestination, destination)) {
removeInternal(destination, sessionId, subscription.getId());
String subscriptionId = subscription.getId();
this.destinationCache.forEach((destination, sessionIdToSubscriptionIds) -> {
List<String> subscriptionIds = sessionIdToSubscriptionIds.get(sessionId);
if (subscriptionIds != null && subscriptionIds.contains(subscriptionId)) {
removeInternal(destination, sessionId, subscriptionId);
}
}
});
}
else {
removeInternal(subscription.getDestination(), sessionId, subscription.getId());