Make call canceling more reliable. #1782
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
We had a bug where the socket-being-connected wasn't being closed when the application used Call.cancel(). The problem is that the SocketConnector model assumes the Connection doesn't want a Socket instance until it's fully connected. This moves the SocketConnector code back into Connection, removes a lot of nested try/catch blocks, and assigns a Socket instance as soon as its created. This also likely fixes some bugs where sockets weren't being closed when an IOException or RouteException was thrown during connection. Now we always close at the top level of connect() unless the connection is successful. #1779
|
Git was not kind to this diff. |
JakeWharton
added a commit
that referenced
this pull request
Aug 2, 2015
Make call canceling more reliable.
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.
We had a bug where the socket-being-connected wasn't being closed when the
application used Call.cancel(). The problem is that the SocketConnector model
assumes the Connection doesn't want a Socket instance until it's fully
connected.
This moves the SocketConnector code back into Connection, removes a lot of
nested try/catch blocks, and assigns a Socket instance as soon as its created.
This also likely fixes some bugs where sockets weren't being closed when
an IOException or RouteException was thrown during connection. Now we always
close at the top level of connect() unless the connection is successful.
#1779