Synchronise access to channelNameToChannelMap #142
Merged
Conversation
This file contains hidden or 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
zmarkan
force-pushed
the
bug/concurrentMoficiationException_when_iterating_channels
branch
from
c10cd1b to
4c64b7b
Compare
mdpye
reviewed
Mar 29, 2017
| channelNameToChannelMap.put(channel.getName(), channel); | ||
| sendOrQueueSubscribeMessage(channel); | ||
| synchronized (channelNameToChannelMap){ | ||
| validateArgumentsAndBindEvents(channel, listener, eventNames); |
Contributor
There was a problem hiding this comment.
Do we need these non-map accesses to be inside the critical section? Some of them may also take locks...
zmarkan
force-pushed
the
bug/concurrentMoficiationException_when_iterating_channels
branch
2 times, most recently
from
054cafe to
cc4e58e
Compare
| if (connection.getState() == ConnectionState.CONNECTED) { | ||
| sendUnsubscribeMessage(channel); | ||
| } | ||
| final InternalChannel channel = channelNameToChannelMap.remove(channelName); |
|
|
||
| for (final InternalChannel channel : channelNameToChannelMap.values()) { | ||
| sendOrQueueSubscribeMessage(channel); | ||
| if (change.getCurrentState() == ConnectionState.CONNECTED) { |
Contributor
There was a problem hiding this comment.
I don't like this new indentation.
Contributor
|
Your editor seems to have changed the indentation on lots of otherwise unchanged lines |
zmarkan
force-pushed
the
bug/concurrentMoficiationException_when_iterating_channels
branch
from
cc4e58e to
65a9f5a
Compare
zmarkan
force-pushed
the
bug/concurrentMoficiationException_when_iterating_channels
branch
from
65a9f5a to
6485a0c
Compare
zmarkan
deleted the
bug/concurrentMoficiationException_when_iterating_channels
branch
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.
This would avoid the ConcurrentModificationException if unsubscribe/subscribe happens when connecting to the channel.