Merge pull request #2074 from jcanizales/fix-metadata-usage-in-example

Fix NPE for trying to add metadata to error when it was nil
pull/2079/head
Michael Lumish 10 years ago
commit c1c697a897
  1. 5
      src/objective-c/GRPCClient/GRPCCall.m

@ -319,9 +319,12 @@ NSString * const kGRPCStatusMetadataKey = @"io.grpc.StatusMetadataKey";
if (strongSelf) {
[strongSelf->_responseMetadata addEntriesFromDictionary:trailers];
NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:error.userInfo];
if (error) {
NSMutableDictionary *userInfo =
[NSMutableDictionary dictionaryWithDictionary:error.userInfo];
userInfo[kGRPCStatusMetadataKey] = strongSelf->_responseMetadata;
error = [NSError errorWithDomain:error.domain code:error.code userInfo:userInfo];
}
[strongSelf finishWithError:error];
}
}];

Loading…
Cancel
Save