@@ -262,13 +262,13 @@ + (EDOServiceResponse *)sendSynchronousRequest:(EDOServiceRequest *)request
262262 while (currentAttempt < maxAttempts) {
263263 NSError *connectionError;
264264 uint64_t connectionStartTime = mach_absolute_time ();
265- dispatch_queue_t connectionQueue = nil ;
266265 dispatch_queue_t executionQueue = executor.executionQueue ;
267- if (executionQueue) {
268- dispatch_queue_attr_t queueAttributes = dispatch_queue_attr_make_with_qos_class (
269- DISPATCH_QUEUE_SERIAL , dispatch_queue_get_qos_class (executionQueue, nil ), 0 );
270- connectionQueue = dispatch_queue_create (" com.google.edo.connectChannel" , queueAttributes);
271- }
266+ dispatch_qos_class_t qosClass =
267+ executionQueue ? dispatch_queue_get_qos_class (executionQueue, nil ) : qos_class_self ();
268+ dispatch_queue_attr_t queueAttributes =
269+ dispatch_queue_attr_make_with_qos_class (DISPATCH_QUEUE_SERIAL , qosClass, 0 );
270+ dispatch_queue_t connectionQueue =
271+ dispatch_queue_create (" com.google.edo.connectChannel" , queueAttributes);
272272 id <EDOChannel> channel = [EDOChannelPool.sharedChannelPool channelWithPort: port
273273 connectionQueue: connectionQueue
274274 error: &connectionError];
@@ -427,7 +427,8 @@ + (NSData *)sendRequestData:(NSData *)requestData withChannel:(id<EDOChannel>)ch
427427 };
428428
429429 // Check ping response to make sure channel is healthy.
430- [channel receiveDataWithHandler: receiveHandler];
430+ [channel receiveDataWithQueue: dispatch_get_global_queue (qos_class_self (), 0 )
431+ handler: receiveHandler];
431432
432433 dispatch_time_t timeoutInSeconds = dispatch_time (DISPATCH_TIME_NOW , kPingTimeoutSeconds );
433434 long result = dispatch_semaphore_wait (waitLock, timeoutInSeconds);
0 commit comments