diff options
| author |  Yang Gao <yangg@google.com> | 2015-03-11 14:30:35 -0700 |
|---|---|---|
| committer | Yang Gao <yangg@google.com> | 2015-03-11 14:30:35 -0700 |
| commit | 2fe6ecebee7937c96a76a16cf7449d8aa5b334bb (patch) | |
| tree | 6ceb96df9ac576294a4a1fed4fef2b00fe83ae10 /src/cpp | |
| parent | 0cb6c25e711ea32b4f2be1126cf0270837e0bc5f (diff) | |
| parent | 6063b9ff526b293a389fa0377a59346c5bb222c1 (diff) | |
Merge branch 'master' into untypedAPI
Diffstat (limited to 'src/cpp')
| -rw-r--r-- | src/cpp/client/secure_credentials.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc index 5eb5c54794..47f645c1b6 100644 --- a/src/cpp/client/secure_credentials.cc +++ b/src/cpp/client/secure_credentials.cc @@ -54,7 +54,8 @@ class SecureCredentials GRPC_FINAL : public Credentials { grpc_channel_args channel_args; args.SetChannelArgs(&channel_args); return std::shared_ptr<ChannelInterface>(new Channel( - target, + args.GetSslTargetNameOverride().empty() + ? target : args.GetSslTargetNameOverride(), grpc_secure_channel_create(c_creds_, target.c_str(), &channel_args))); } |