Squashed 'apollo-ios/' changes from d3ed72bd..0adf0250

gh-action-runner · gh-action-runner · commit 0b42c943c68a · 2024-10-31T22:52:09.000Z
0adf0250 fix: Assign websocket callback queue before connecting (#529) git-subtree-dir: apollo-ios git-subtree-split: 0adf0250e7f363345117766f3689e4c3e669c910
diff --git a/Sources/ApolloWebSocket/WebSocketTransport.swift b/Sources/ApolloWebSocket/WebSocketTransport.swift
@@ -167,10 +167,14 @@ public class WebSocketTransport {
     self.addApolloClientHeaders(to: &self.websocket.request)
 
     self.websocket.delegate = self
+    // Keep the assignment of the callback queue before attempting to connect. There is the
+    // potential of a data race if the connection fails early and the disconnect logic reads
+    // the callback queue while it's being set.
+    self.websocket.callbackQueue = processingQueue
+
     if config.connectOnInit {
       self.websocket.connect()
     }
-    self.websocket.callbackQueue = processingQueue
   }
 
   public func isConnected() -> Bool {

Original file line number	Diff line number	Diff line change
`@@ -167,10 +167,14 @@ public class WebSocketTransport {`
`167`	`167`	`self.addApolloClientHeaders(to: &self.websocket.request)`
`168`	`168`
`169`	`169`	`self.websocket.delegate = self`
	`170`	`+ // Keep the assignment of the callback queue before attempting to connect. There is the`
	`171`	`+ // potential of a data race if the connection fails early and the disconnect logic reads`
	`172`	`+ // the callback queue while it's being set.`
	`173`	`+ self.websocket.callbackQueue = processingQueue`
	`174`	`+`
`170`	`175`	`if config.connectOnInit {`
`171`	`176`	`self.websocket.connect()`
`172`	`177`	`}`
`173`		`- self.websocket.callbackQueue = processingQueue`
`174`	`178`	`}`
`175`	`179`
`176`	`180`	`public func isConnected() -> Bool {`