Skip to content

Fix for URLSession registers native protocol classes for each new session #1030

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.

Sign up for GitHub

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

Jump to bottom
Merged
swift-ci merged 1 commit into from
Jun 21, 2017
Merged

Fix for URLSession registers native protocol classes for each new session #1030

swift-ci merged 1 commit into from
Jun 21, 2017

Conversation

@nethraravindran
Copy link
Contributor

@nethraravindran nethraravindran commented Jun 6, 2017

No description provided.

@nethraravindran nethraravindran mentioned this pull request Jun 6, 2017
Merged
alblue
alblue suggested changes Jun 9, 2017
View reviewed changes
Copy link
Contributor

@alblue alblue left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use a different mechanism, such as dispatch_once, to ensure they are only added a single time, rather than special casing (and breaking) the API.

Foundation/NSURLProtocol.swift Outdated

internal class func getProtocols() -> [AnyClass]? {
return _registeredProtocolClasses
return _nativeProtocolClasses
Copy link
Contributor

@alblue alblue Jun 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is going to break anyone who registers their protocol classes via the supported APIs, right? Creating a special-case for HTTPURLProtocol does not look like the way to fix this problem. Instead, the protocol classes should be added using a dispatch_once style mechanism, so that they aren't added each time.

@nethraravindran
Copy link
Contributor Author

nethraravindran commented Jun 19, 2017

@alblue Thanks for the review comments. I have used static let which works like dispatch_once.
https://stackoverflow.com/questions/37801407/whither-dispatch-once-in-swift-3?answertab=votes#tab-top

@pushkarnk
Copy link
Member

pushkarnk commented Jun 20, 2017

@swift-ci please test

pushkarnk
pushkarnk reviewed Jun 20, 2017
View reviewed changes
Foundation/NSURLSession/NSURLSession.swift Outdated
internal let taskRegistry = URLSession._TaskRegistry()
fileprivate let identifier: Int32
fileprivate var invalidated = false
fileprivate static let registerProtocols: Void = {
Copy link
Member

@pushkarnk pushkarnk Jun 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the Void necessary here?

@pushkarnk
Copy link
Member

pushkarnk commented Jun 21, 2017

Thanks @nethraravindran and @alblue

@swift-ci please test and merge

@pushkarnk
Copy link
Member

pushkarnk commented Jun 21, 2017

@swift-ci please test and merge

@pushkarnk
Copy link
Member

pushkarnk commented Jun 21, 2017

Some unrelated tests seem to have failed:

TestFoundation/TestMassFormatter.swift:102: error: TestMassFormatter.test_unitStringFromKilograms : XCTAssertEqual failed: ("lb") is not equal to ("kg") - 
TestFoundation/TestMassFormatter.swift:103: error: TestMassFormatter.test_unitStringFromKilograms : XCTAssertEqual failed: ("pound") is not equal to ("kilogram") - 
TestFoundation/TestMassFormatter.swift:105: error: TestMassFormatter.test_unitStringFromKilograms : XCTAssertEqual failed: ("lb") is not equal to ("kg") - 
TestFoundation/TestMassFormatter.swift:106: error: TestMassFormatter.test_unitStringFromKilograms : XCTAssertEqual failed: ("pound") is not equal to ("kilogram") - 
TestFoundation/TestMassFormatter.swift:108: error: TestMassFormatter.test_unitStringFromKilograms : XCTAssertEqual failed: ("oz") is not equal to ("g") - 
TestFoundation/TestMassFormatter.swift:109: error: TestMassFormatter.test_unitStringFromKilograms : XCTAssertEqual failed: ("ounce") is not equal to ("gram") - 
TestFoundation/TestMassFormatter.swift:111: error: TestMassFormatter.test_unitStringFromKilograms : XCTAssertEqual failed: ("lb") is not equal to ("g") - 
TestFoundation/TestMassFormatter.swift:112: error: TestMassFormatter.test_unitStringFromKilograms : XCTAssertEqual failed: ("pound") is not equal to ("gram") - 
TestFoundation/TestMassFormatter.swift:114: error: TestMassFormatter.test_unitStringFromKilograms : XCTAssertEqual failed: ("lb") is not equal to ("kg")

@pushkarnk
Copy link
Member

pushkarnk commented Jun 21, 2017

Looks like the reason is #1043

@pushkarnk
Copy link
Member

pushkarnk commented Jun 21, 2017

@swift-ci please test and merge

1 similar comment
@pushkarnk
Copy link
Member

pushkarnk commented Jun 21, 2017

@swift-ci please test and merge

@swift-ci swift-ci merged commit 031a257 into swiftlang:master Jun 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pushkarnk pushkarnk pushkarnk left review comments

+1 more reviewer

@alblue alblue alblue approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@nethraravindran @pushkarnk @alblue @swift-ci