From 148403af988522e61f4e71dc1bbd00b9f0d51a42 Mon Sep 17 00:00:00 2001
From: Jorge Canizales <jcanizales@google.com>
Date: Sat, 1 Aug 2015 02:56:04 -0700
Subject: [PATCH] Remove GRPCChannel-initWithHost to simplify implementation

---
 .../GRPCClient/private/GRPCChannel.h          |  1 -
 .../GRPCClient/private/GRPCChannel.m          | 22 ++++++++-----------
 .../GRPCClient/private/GRPCSecureChannel.h    |  2 +-
 .../GRPCClient/private/GRPCUnsecuredChannel.h |  2 +-
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/objective-c/GRPCClient/private/GRPCChannel.h b/src/objective-c/GRPCClient/private/GRPCChannel.h
index 49f5bfcc18b..49f8b712b9d 100644
--- a/src/objective-c/GRPCClient/private/GRPCChannel.h
+++ b/src/objective-c/GRPCClient/private/GRPCChannel.h
@@ -43,7 +43,6 @@
 // Convenience constructor to allow for reuse of connections.
 + (instancetype)channelToHost:(NSString *)host;
 
-- (instancetype)initWithHost:(NSString *)host NS_DESIGNATED_INITIALIZER;
 - (instancetype)initWithChannel:(grpc_channel *)unmanagedChannel
                        hostName:(NSString *)hostName NS_DESIGNATED_INITIALIZER;
 
diff --git a/src/objective-c/GRPCClient/private/GRPCChannel.m b/src/objective-c/GRPCClient/private/GRPCChannel.m
index 44f64e704a4..90973cd83d0 100644
--- a/src/objective-c/GRPCClient/private/GRPCChannel.m
+++ b/src/objective-c/GRPCClient/private/GRPCChannel.m
@@ -54,17 +54,13 @@
   });
   GRPCChannel *channel = channelCache[host];
   if (!channel) {
-    channel = [[self alloc] initWithHost:host];
+    channel = [self uncachedChannelToHost:host];
     channelCache[host] = channel;
   }
   return channel;
 }
 
-- (instancetype)init {
-  return [self initWithHost:nil];
-}
-
-- (instancetype)initWithHost:(NSString *)host {
++ (instancetype)uncachedChannelToHost:(NSString *)host {
   if (![host rangeOfString:@"://"].length) {
     // No scheme provided; assume https.
     host = [@"https://" stringByAppendingString:host];
@@ -86,6 +82,10 @@
   return nil; // silence warning.
 }
 
+- (instancetype)init {
+  return [self initWithChannel:NULL hostName:nil];
+}
+
 - (instancetype)initWithChannel:(struct grpc_channel *)unmanagedChannel
                        hostName:(NSString *)hostName {
   if (!unmanagedChannel || !hostName) {
@@ -113,12 +113,8 @@
 }
 
 - (void)dealloc {
-  // _unmanagedChannel is NULL when deallocating an object of the base class (because the
-  // initializer returns a different object).
-  if (_unmanagedChannel) {
-    // TODO(jcanizales): Be sure to add a test with a server that closes the connection prematurely,
-    // as in the past that made this call to crash.
-    grpc_channel_destroy(_unmanagedChannel);
-  }
+  // TODO(jcanizales): Be sure to add a test with a server that closes the connection prematurely,
+  // as in the past that made this call to crash.
+  grpc_channel_destroy(_unmanagedChannel);
 }
 @end
diff --git a/src/objective-c/GRPCClient/private/GRPCSecureChannel.h b/src/objective-c/GRPCClient/private/GRPCSecureChannel.h
index d34ceaea0c1..8c5fe33d61e 100644
--- a/src/objective-c/GRPCClient/private/GRPCSecureChannel.h
+++ b/src/objective-c/GRPCClient/private/GRPCSecureChannel.h
@@ -34,5 +34,5 @@
 #import "GRPCChannel.h"
 
 @interface GRPCSecureChannel : GRPCChannel
-
+- (instancetype)initWithHost:(NSString *)host NS_DESIGNATED_INITIALIZER;
 @end
diff --git a/src/objective-c/GRPCClient/private/GRPCUnsecuredChannel.h b/src/objective-c/GRPCClient/private/GRPCUnsecuredChannel.h
index 9d89cfb5419..8528be44c00 100644
--- a/src/objective-c/GRPCClient/private/GRPCUnsecuredChannel.h
+++ b/src/objective-c/GRPCClient/private/GRPCUnsecuredChannel.h
@@ -34,5 +34,5 @@
 #import "GRPCChannel.h"
 
 @interface GRPCUnsecuredChannel : GRPCChannel
-
+- (instancetype)initWithHost:(NSString *)host NS_DESIGNATED_INITIALIZER;
 @end