Fix lock issues around disableSSL and IOBuffer#2295
Merged
Jeffery-Wasty merged 8 commits intomainfrom Jan 17, 2024
Merged
Conversation
This was
linked to
issues
Jan 11, 2024
David-Engel
previously approved these changes
Jan 11, 2024
Collaborator
David-Engel
left a comment
David-Engel
left a comment
There was a problem hiding this comment.
I scanned the previous loom PR again and this looks like the complete fix to me. The only other suggestion I might make is to rename the lock variable introduced in the original PR in IOBuffer's TDSReader class to tdsReaderLock to make its scope clear for future developers.
lilgreenbird
approved these changes
Jan 11, 2024
David-Engel
approved these changes
Jan 13, 2024
barryw-mssql
approved these changes
Jan 13, 2024
tkyc
approved these changes
Jan 16, 2024
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
When migrating from
synchronizedkeyword to locks, any method that usedsynchronized(this)was then locked using the same lock declared at the top of TDSChannel. This is not correct as most of thesynchronzed(this)methods were also in an inner class, but disableSSL was not. Therefore, disableSSL should have a separate lock. This resolves the deadlock issues found in #2265 and #2288.