Fix handler release - Part 1

2 files changed, 18 insertions, 30 deletions

diff --git a/src/objective-c/tests/APIv2Tests/APIv2Tests.m b/src/objective-c/tests/APIv2Tests/APIv2Tests.m
index 28f94cd8c7..e49f58ae9d 100644
--- a/src/objective-c/tests/APIv2Tests/APIv2Tests.m
+++ b/src/objective-c/tests/APIv2Tests/APIv2Tests.m
@@ -82,28 +82,22 @@ static const NSTimeInterval kTestTimeout = 16;
 }
 
 - (void)receivedInitialMetadata:(NSDictionary *_Nullable)initialMetadata {
-  dispatch_async(_dispatchQueue, ^{
-    if (self->_initialMetadataCallback) {
-      self->_initialMetadataCallback(initialMetadata);
-    }
-  });
+  if (self->_initialMetadataCallback) {
+    self->_initialMetadataCallback(initialMetadata);
+  }
 }
 
 - (void)receivedRawMessage:(GPBMessage *_Nullable)message {
-  dispatch_async(_dispatchQueue, ^{
-    if (self->_messageCallback) {
-      self->_messageCallback(message);
-    }
-  });
+  if (self->_messageCallback) {
+    self->_messageCallback(message);
+  }
 }
 
 - (void)closedWithTrailingMetadata:(NSDictionary *_Nullable)trailingMetadata
                              error:(NSError *_Nullable)error {
-  dispatch_async(_dispatchQueue, ^{
-    if (self->_closeCallback) {
-      self->_closeCallback(trailingMetadata, error);
-    }
-  });
+  if (self->_closeCallback) {
+    self->_closeCallback(trailingMetadata, error);
+  }
 }
 
 - (dispatch_queue_t)dispatchQueue {
diff --git a/src/objective-c/tests/InteropTests.m b/src/objective-c/tests/InteropTests.m
index dcc8f1b589..8754bd5cca 100644
--- a/src/objective-c/tests/InteropTests.m
+++ b/src/objective-c/tests/InteropTests.m
@@ -103,28 +103,22 @@ BOOL isRemoteInteropTest(NSString *host) {
 }
 
 - (void)receivedInitialMetadata:(NSDictionary *)initialMetadata {
-  dispatch_async(_dispatchQueue, ^{
-    if (_initialMetadataCallback) {
-      _initialMetadataCallback(initialMetadata);
-    }
-  });
+  if (_initialMetadataCallback) {
+    _initialMetadataCallback(initialMetadata);
+  }
 }
 
 - (void)receivedProtoMessage:(GPBMessage *)message {
-  dispatch_async(_dispatchQueue, ^{
-    if (_messageCallback) {
-      _messageCallback(message);
-    }
-  });
+  if (_messageCallback) {
+    _messageCallback(message);
+  }
 }
 
 - (void)closedWithTrailingMetadata:(NSDictionary *)trailingMetadata
                              error:(NSError *)error {
-  dispatch_async(_dispatchQueue, ^{
-    if (_closeCallback) {
-      _closeCallback(trailingMetadata, error);
-    }
-  });
+  if (_closeCallback) {
+    _closeCallback(trailingMetadata, error);
+  }
 }
 
 - (dispatch_queue_t)dispatchQueue {