Remove retain of handler in callbacks and dispatch to dispatchQueue

1 files changed, 15 insertions, 9 deletions

diff --git a/src/objective-c/tests/GRPCClientTests.m b/src/objective-c/tests/GRPCClientTests.m
index 2021540f28..bbe81502dc 100644
--- a/src/objective-c/tests/GRPCClientTests.m
+++ b/src/objective-c/tests/GRPCClientTests.m
@@ -115,22 +115,28 @@ static GRPCProtoMethod *kFullDuplexCallMethod;
 }
 
 - (void)receivedInitialMetadata:(NSDictionary *_Nullable)initialMetadata {
-  if (_initialMetadataCallback) {
-    _initialMetadataCallback(initialMetadata);
-  }
+  dispatch_async(_dispatchQueue, ^{
+    if (_initialMetadataCallback) {
+      _initialMetadataCallback(initialMetadata);
+    }
+  });
 }
 
 - (void)receivedRawMessage:(GPBMessage *_Nullable)message {
-  if (_messageCallback) {
-    _messageCallback(message);
-  }
+  dispatch_async(_dispatchQueue, ^{
+    if (_messageCallback) {
+      _messageCallback(message);
+    }
+  });
 }
 
 - (void)closedWithTrailingMetadata:(NSDictionary *_Nullable)trailingMetadata
                              error:(NSError *_Nullable)error {
-  if (_closeCallback) {
-    _closeCallback(trailingMetadata, error);
-  }
+  dispatch_async(_dispatchQueue, ^{
+    if (_closeCallback) {
+      _closeCallback(trailingMetadata, error);
+    }
+  });
 }
 
 - (dispatch_queue_t)dispatchQueue {