always unregister observer

7 years ago · 7871fedfd6
parent ac211b4214
commit 7871fedfd6
2 changed files with 2 additions and 10 deletions
--- a/src/objective-c/GRPCClient/GRPCCall.m
+++ b/src/objective-c/GRPCClient/GRPCCall.m
@ -445,11 +445,7 @@ const char *kCFStreamVarName = "grpc_cfstream";
    [_responseWriteable enqueueSuccessfulCompletion];
  }

-  // Connectivity monitor is not required for CFStream
-  char *enableCFStream = getenv(kCFStreamVarName);
-  if (enableCFStream == nil || enableCFStream[0] != '1') {
-    [GRPCConnectivityMonitor unregisterObserver:self];
-  }
+  [GRPCConnectivityMonitor unregisterObserver:self];

  // If the call isn't retained anywhere else, it can be deallocated now.
  _retainSelf = nil;
--- a/src/objective-c/GRPCClient/private/GRPCChannelPool.m
+++ b/src/objective-c/GRPCClient/private/GRPCChannelPool.m
@ -187,11 +187,7 @@ extern const char *kCFStreamVarName;
 }

 - (void)dealloc {
-  // Connectivity monitor is not required for CFStream
-  char *enableCFStream = getenv(kCFStreamVarName);
-  if (enableCFStream == nil || enableCFStream[0] != '1') {
-    [GRPCConnectivityMonitor unregisterObserver:self];
-  }
+  [GRPCConnectivityMonitor unregisterObserver:self];
 }

 - (GRPCChannel *)channelWithConfiguration:(GRPCChannelConfiguration *)configuration {