SPR-15543: Fix duplicate subscriptionId for destination-sessionId key #1427
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Issue: SPR-15543
|
This is now merged. |
|
Is there not possible NPE if subs.get(sessionId) returns null? How about: final LinkedMultiValueMap<String, String> subs = entry.getValue(); |
luyuanwan
reviewed
May 21, 2017
| @@ -292,8 +292,10 @@ public void updateAfterNewSubscription(String destination, String sessionId, Str | |||
| String cachedDestination = entry.getKey(); | |||
| if (getPathMatcher().match(destination, cachedDestination)) { | |||
| LinkedMultiValueMap<String, String> subs = entry.getValue(); | |||
| subs.add(sessionId, subsId); | |||
| this.accessCache.put(cachedDestination, subs.deepCopy()); | |||
| if (!subs.containsKey(sessionId) || !subs.get(sessionId).contains(subsId)) { | |||
There was a problem hiding this comment.
Indeed, thanks for catching this. Fixed!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
DefaultSubscriptionRegistry's destinationCache accessCache contains duplicate subscriptionId for destination - sessionId key if findSubscriptions is called after addSubscription and before updateAfterNewSubscription.
The change includes checking for existing subId in updateAfterNewSubscription method before adding subId value to sessionId key. (Set implementation to avoid duplication can be considered or other better solutions are appreciated).
Issue: SPR-15543
I have submitted CLA.