Skip to content

Nil check our run loop thread #771

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

Merged
HeyImChris merged 17 commits into from
May 13, 2021
+8 −1
Merged

Nil check our run loop thread #771

Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8df39e1
Update RCTCxxBridge.mm
HeyImChris May 14, 2020
4a9bcbd
Merge branch 'master' of https://github.com/microsoft/react-native-macos
HeyImChris Jun 1, 2020
e8d2d8b
Merge pull request #1 from microsoft/master
HeyImChris Aug 17, 2020
ab71c3b
Merge branch 'master' of https://github.com/microsoft/react-native-macos
HeyImChris Sep 3, 2020
e40c784
Merge branch 'master' of https://github.com/microsoft/react-native-macos
HeyImChris Sep 8, 2020
204ddb3
Merge branch 'master' of https://github.com/microsoft/react-native-macos
HeyImChris Sep 16, 2020
a76bcc1
Merge branch 'master' of https://github.com/microsoft/react-native-macos
HeyImChris Nov 27, 2020
7d85560
Merge branch 'master' of https://github.com/microsoft/react-native-macos
HeyImChris Dec 4, 2020
7011dc4
Merge branch 'master' of https://github.com/microsoft/react-native-macos
HeyImChris Dec 11, 2020
abfbabf
Merge branch 'master' of https://github.com/microsoft/react-native-macos
HeyImChris Jan 13, 2021
19aa189
Merge branch 'master' of https://github.com/microsoft/react-native-macos
HeyImChris Jan 25, 2021
ea4f432
Update RCTCxxBridge.mm
HeyImChris May 14, 2020
41fd8d4
Merge branch 'master' of https://github.com/HeyImChris/react-native-m…
HeyImChris Feb 5, 2021
645ccf0
Merge branch 'master' of https://github.com/HeyImChris/react-native-m…
HeyImChris Feb 12, 2021
1cd4f9a
Merge branch 'master' of https://github.com/microsoft/react-native-macos
HeyImChris Mar 9, 2021
f3971a2
Merge remote-tracking branch 'upstream/master'
May 5, 2021
66da532
run loop nil check
HeyImChris May 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion Libraries/WebSocket/RCTSRWebSocket.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,14 @@ - (void)_initializeStreams
- (void)_connect
{
if (!_scheduledRunloops.count) {
[self scheduleInRunLoop:[NSRunLoop RCTSR_networkRunLoop] forMode:NSDefaultRunLoopMode];
// [TODO(macOS ISS#2323203): `scheduleInRunLoop:forMode:` takes in a non-null run loop parameter so let's be safe and verify that
Copy link
Collaborator

@Saadnajmi Saadnajmi May 13, 2021

Choose a reason for hiding this comment

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

Do we have a better bug number or can we create one in git then this generic ISS number?

Copy link
Author

@HeyImChris HeyImChris May 13, 2021

Choose a reason for hiding this comment

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

I looked and one didn't exist. I figure since we need to go through and update all of these anyway, making it one that we can easily track/update all at once might be easier than making a new one and not tracking it well/forgetting about it

NSRunLoop *runLoop = [NSRunLoop RCTSR_networkRunLoop];
if (runLoop != nil) {
[self scheduleInRunLoop:runLoop forMode:NSDefaultRunLoopMode];
} else {
RCTSRLog(@"Failed connecting to RCTSR_networkRunLoop");
}
// ]TODO(macOS ISS#2323203)
}

[_outputStream open];
Expand Down