batch fixes

3 files changed, 15 insertions, 18 deletions

diff --git a/src/objective-c/GRPCClient/private/GRPCChannel.m b/src/objective-c/GRPCClient/private/GRPCChannel.m
index edcedf6e24..12acfa1429 100644
--- a/src/objective-c/GRPCClient/private/GRPCChannel.m
+++ b/src/objective-c/GRPCClient/private/GRPCChannel.m
@@ -50,16 +50,17 @@
 }
 
 - (id<GRPCChannelFactory>)channelFactory {
-  NSError *error;
-  id<GRPCChannelFactory> factory;
   GRPCTransportType type = _callOptions.transportType;
   switch (type) {
     case GRPCTransportTypeChttp2BoringSSL:
       // TODO (mxyan): Remove when the API is deprecated
 #ifdef GRPC_COMPILE_WITH_CRONET
       if (![GRPCCall isUsingCronet]) {
+#else
+        {
 #endif
-        factory = [GRPCSecureChannelFactory
+        NSError *error;
+        id<GRPCChannelFactory> factory = [GRPCSecureChannelFactory
             factoryWithPEMRootCertificates:_callOptions.PEMRootCertificates
                                 privateKey:_callOptions.PEMPrivateKey
                                  certChain:_callOptions.PEMCertificateChain
@@ -69,9 +70,7 @@
           NSLog(@"Error creating secure channel factory: %@", error);
         }
         return factory;
-#ifdef GRPC_COMPILE_WITH_CRONET
       }
-#endif
       // fallthrough
     case GRPCTransportTypeCronet:
       return [GRPCCronetChannelFactory sharedInstance];
@@ -164,7 +163,7 @@
 }
 
 - (NSUInteger)hash {
-  NSUInteger result = 0;
+  NSUInteger result = 31;
   result ^= _host.hash;
   result ^= _callOptions.channelOptionsHash;
 
@@ -230,10 +229,7 @@
   NSTimeInterval timeout = callOptions.timeout;
   NSAssert(timeout >= 0, @"Invalid timeout");
   if (timeout < 0) return NULL;
-  grpc_slice host_slice = grpc_empty_slice();
-  if (serverAuthority) {
-    host_slice = grpc_slice_from_copied_string(serverAuthority.UTF8String);
-  }
+                           grpc_slice host_slice = serverAuthority ? grpc_slice_from_copied_string(serverAuthority.UTF8String) : grpc_empty_slice();
   grpc_slice path_slice = grpc_slice_from_copied_string(path.UTF8String);
   gpr_timespec deadline_ms =
       timeout == 0 ? gpr_inf_future(GPR_CLOCK_REALTIME)
diff --git a/src/objective-c/GRPCClient/private/GRPCHost.m b/src/objective-c/GRPCClient/private/GRPCHost.m
index e7a7460221..24348c3aed 100644
--- a/src/objective-c/GRPCClient/private/GRPCHost.m
+++ b/src/objective-c/GRPCClient/private/GRPCHost.m
@@ -75,7 +75,7 @@ static NSMutableDictionary *gHostCache;
     }
 
     if ((self = [super init])) {
-      _address = address;
+      _address = [address copy];
       _retryEnabled = YES;
       gHostCache[address] = self;
     }
diff --git a/src/objective-c/ProtoRPC/ProtoRPC.m b/src/objective-c/ProtoRPC/ProtoRPC.m
index 0f63f72f53..89f0b3f347 100644
--- a/src/objective-c/ProtoRPC/ProtoRPC.m
+++ b/src/objective-c/ProtoRPC/ProtoRPC.m
@@ -97,14 +97,13 @@ static NSError *ErrorForBadProto(id proto, Class expectedClass, NSError *parsing
                        responseHandler:(id<GRPCProtoResponseHandler>)handler
                            callOptions:(GRPCCallOptions *)callOptions
                          responseClass:(Class)responseClass {
-  if (requestOptions.host.length == 0 || requestOptions.path.length == 0) {
-    [NSException raise:NSInvalidArgumentException format:@"Neither host nor path can be nil."];
-  }
-  if (requestOptions.safety > GRPCCallSafetyCacheableRequest) {
-    [NSException raise:NSInvalidArgumentException format:@"Invalid call safety value."];
+  NSAssert(requestOptions.host.length != 0 && requestOptions.path.length != 0 && requestOptions.safety <= GRPCCallSafetyCacheableRequest, @"Invalid callOptions.");
+  NSAssert(handler != nil, @"handler cannot be empty.");
+  if (requestOptions.host.length == 0 || requestOptions.path.length == 0 || requestOptions.safety > GRPCCallSafetyCacheableRequest) {
+    return nil;
   }
   if (handler == nil) {
-    [NSException raise:NSInvalidArgumentException format:@"Response handler required."];
+    return nil;
   }
 
   if ((self = [super init])) {
@@ -166,8 +165,10 @@ static NSError *ErrorForBadProto(id proto, Class expectedClass, NSError *parsing
 }
 
 - (void)writeMessage:(GPBMessage *)message {
+  NSAssert([message isKindOfClass:[GPBMessage class]]);
   if (![message isKindOfClass:[GPBMessage class]]) {
-    [NSException raise:NSInvalidArgumentException format:@"Data must be a valid protobuf type."];
+    NSLog(@"Failed to send a message that is non-proto.");
+    return;
   }
 
   GRPCCall2 *call;