-
Notifications
You must be signed in to change notification settings - Fork 6.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update OkHttp version from RC to 3.0.1 #917
Conversation
Thanks for your pull request. It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). 📝 Please visit https://cla.developers.google.com/ to sign. Once you've signed, please reply here (e.g.
|
I signed it! |
Thanks, do you mind squashing your commits? |
cleans up Memory leak, because raw data was not released
squashed |
@@ -352,6 +352,7 @@ public void clear() { | |||
bitmapProvider.release(previousImage); | |||
} | |||
previousImage = null; | |||
rawData = null; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Merge error maybe?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
His branch is 1 PR behind, should the merge handle this? He's also using the same 3.0 branch as a feature branch.
Though it's probably better if @frindly tries to rebase.
Ah yeah, I think this will be fine. I'll try merging and we will see :). |
Update OkHttp version from RC to 3.0.1
Yup worked, thanks! |
Yeah, your merge "commit" is showing the correct diff, but his single commit shows the same diff with the extra line added. So it kind-of worked :) The only weird thing I don't like is the Blame shows his commit for that line and not the original one. So it's worth cleaning up the commits properly before accepting the PR to not confuse the VCS history. |
Updating to newest ok http version