Merge pull request grpc#923 from rauls5382/master

Propagate grpc_google_default_credentials_create errors
theduffmtl · Mar 3, 2015 · 0cfc638 · 0cfc638
2 parents ba4a105 + 02fe58d
commit 0cfc638
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/cpp/client/credentials.cc b/src/cpp/client/credentials.cc
@@ -47,7 +47,8 @@ grpc_credentials *Credentials::GetRawCreds() { return creds_; }
 
 std::unique_ptr<Credentials> CredentialsFactory::GoogleDefaultCredentials() {
   grpc_credentials *c_creds = grpc_google_default_credentials_create();
-  std::unique_ptr<Credentials> cpp_creds(new Credentials(c_creds));
+  std::unique_ptr<Credentials> cpp_creds(
+      c_creds == nullptr ? nullptr : new Credentials(c_creds));
   return cpp_creds;
 }