diff options
author | Muxi Yan <mxyan@google.com> | 2018-10-18 11:13:22 -0700 |
---|---|---|
committer | Muxi Yan <mxyan@google.com> | 2018-10-18 11:13:22 -0700 |
commit | 7871fedfd6e594ac5935d2018b9680e18979991c (patch) | |
tree | 2a3f3fe216352c940ae03f6cdf081920918823f8 /src | |
parent | ac211b4214b9a5bbc00631b61af396557837b9fb (diff) |
always unregister observer
Diffstat (limited to 'src')
-rw-r--r-- | src/objective-c/GRPCClient/GRPCCall.m | 6 | ||||
-rw-r--r-- | src/objective-c/GRPCClient/private/GRPCChannelPool.m | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/objective-c/GRPCClient/GRPCCall.m b/src/objective-c/GRPCClient/GRPCCall.m index 68f0f8892d..a142c669db 100644 --- 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; diff --git a/src/objective-c/GRPCClient/private/GRPCChannelPool.m b/src/objective-c/GRPCClient/private/GRPCChannelPool.m index 4fae7d57ca..5707e7f950 100644 --- 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 { |