Simplify reference count juggling

pull/23203/head
Richard Belleville 5 years ago
parent ac08c9ba28
commit b61213c094
  1. 6
      src/core/lib/security/credentials/google_default/compute_engine_channel_credentials.cc
  2. 6
      src/core/lib/security/credentials/google_default/google_default_credentials.cc

@ -61,10 +61,8 @@ grpc_channel_credentials* grpc_compute_engine_channel_credentials_create(
grpc_alts_credentials_options_destroy(options); grpc_alts_credentials_options_destroy(options);
auto creds = new grpc_google_default_channel_credentials( auto creds = new grpc_google_default_channel_credentials(
alts_creds != nullptr ? alts_creds->Ref() : nullptr, grpc_core::RefCountedPtr<grpc_channel_credentials>(alts_creds),
ssl_creds != nullptr ? ssl_creds->Ref() : nullptr); grpc_core::RefCountedPtr<grpc_channel_credentials>(ssl_creds));
if (ssl_creds) ssl_creds->Unref();
if (alts_creds) alts_creds->Unref();
return creds; return creds;
} }

@ -333,10 +333,8 @@ end:
grpc_alts_credentials_options_destroy(options); grpc_alts_credentials_options_destroy(options);
auto creds = auto creds =
grpc_core::MakeRefCounted<grpc_google_default_channel_credentials>( grpc_core::MakeRefCounted<grpc_google_default_channel_credentials>(
alts_creds != nullptr ? alts_creds->Ref() : nullptr, grpc_core::RefCountedPtr<grpc_channel_credentials>(alts_creds),
ssl_creds != nullptr ? ssl_creds->Ref() : nullptr); grpc_core::RefCountedPtr<grpc_channel_credentials>(ssl_creds));
if (ssl_creds) ssl_creds->Unref();
if (alts_creds) alts_creds->Unref();
result = grpc_composite_channel_credentials_create( result = grpc_composite_channel_credentials_create(
creds.get(), call_creds.get(), nullptr); creds.get(), call_creds.get(), nullptr);
GPR_ASSERT(result != nullptr); GPR_ASSERT(result != nullptr);

Loading…
Cancel
Save