Fixes #585 MessageId not limited to 65535 #586
Merged
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
hylkevds
force-pushed
the
fix_585_MessageId_not_limited_to_65535
branch
from
27e41c4
to
3692323
Compare
andsel
reviewed
Jul 2, 2021
| @@ -503,7 +503,22 @@ public void resendNotAckedPublishes() { | |||
| } | |||
|
|
|||
| int nextPacketId() { | |||
| return lastPacketId.incrementAndGet(); | |||
| final int next = lastPacketId.incrementAndGet(); | |||
There was a problem hiding this comment.
I think we can simplify with
return lastPacketId.updateAndGet(v -> v == 65_536 ? 1 : v + 1);There was a problem hiding this comment.
Yep, good point.
Much nicer :)
There was a problem hiding this comment.
Should compare to 65_535, since 65_536 is already invalid...
Message ID should always be in the range 1 - 65535. This adds a test, and, and resets the counter to 1 when needed.
hylkevds
force-pushed
the
fix_585_MessageId_not_limited_to_65535
branch
from
3692323
to
ef89026
Compare
|
Simplified now :) |
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.
Message ID should always be in the range 1 - 65535. This adds a test, and resets the counter to 1 when needed.