Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed empty shared subscriptions list remaining forever #836

Merged
merged 1 commit into from
Apr 30, 2024
Merged

Fixed empty shared subscriptions list remaining forever #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions broker/src/main/java/io/moquette/broker/subscriptions/CTrieSubscriptionDirectory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,13 +192,13 @@ public String dumpTree() {

@Override
public void removeSharedSubscriptionsForClient(String clientId) {
List<SharedSubscription> sessionSharedSubscriptions = clientSharedSubscriptions
.computeIfAbsent(clientId, s -> Collections.emptyList());

// remove the client from all shared subscriptions
for (SharedSubscription subscription : sessionSharedSubscriptions) {
UnsubscribeRequest request = UnsubscribeRequest.buildShared(subscription.getShareName(), subscription.topicFilter(), clientId);
ctrie.removeFromTree(request);
List<SharedSubscription> sessionSharedSubscriptions = clientSharedSubscriptions.remove(clientId);
if (sessionSharedSubscriptions != null) {
// remove the client from all shared subscriptions
for (SharedSubscription subscription : sessionSharedSubscriptions) {
UnsubscribeRequest request = UnsubscribeRequest.buildShared(subscription.getShareName(), subscription.topicFilter(), clientId);
ctrie.removeFromTree(request);
}
}

subscriptionsRepository.removeAllSharedSubscriptions(clientId);
Expand Down
2 changes: 1 addition & 1 deletion broker/src/main/java/io/moquette/persistence/H2SubscriptionsRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public void removeSubscription(String topicFilter, String clientID) {
public void removeAllSharedSubscriptions(String clientId) {
final String sharedSubsMapName = sharedSubscriptions.get(clientId);
if (sharedSubsMapName == null) {
LOG.info("Removing all shared subscription of a non existing client: {}", clientId);
LOG.debug("Removing all shared subscription of a non existing client: {}", clientId);
return;
}
wipeAllSharedSubscripptions(clientId, sharedSubsMapName);
Expand Down
Loading