From 222dd9f3402e013aa229b260ccc87d70f7c4831d Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 24 Jan 2019 16:05:24 -0500 Subject: [PATCH] fixes from code review --- src/csharp/Grpc.Core/CallOptions.cs | 2 +- src/csharp/Grpc.Core/Internal/AsyncCall.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/csharp/Grpc.Core/CallOptions.cs b/src/csharp/Grpc.Core/CallOptions.cs index 89fd047a1ea..a92caae917d 100644 --- a/src/csharp/Grpc.Core/CallOptions.cs +++ b/src/csharp/Grpc.Core/CallOptions.cs @@ -238,7 +238,7 @@ namespace Grpc.Core var newOptions = this; // silently ignore the context propagation token if it wasn't produced by "us" var propagationTokenImpl = propagationToken.AsImplOrNull(); - if (propagationToken != null) + if (propagationTokenImpl != null) { if (propagationTokenImpl.Options.IsPropagateDeadline) { diff --git a/src/csharp/Grpc.Core/Internal/AsyncCall.cs b/src/csharp/Grpc.Core/Internal/AsyncCall.cs index f80ac4a2f9d..785081c341a 100644 --- a/src/csharp/Grpc.Core/Internal/AsyncCall.cs +++ b/src/csharp/Grpc.Core/Internal/AsyncCall.cs @@ -494,7 +494,7 @@ namespace Grpc.Core.Internal return injectedNativeCall; // allows injecting a mock INativeCall in tests. } - var parentCall = details.Options.PropagationToken != null ? details.Options.PropagationToken.AsImplOrNull().ParentCall : CallSafeHandle.NullInstance; + var parentCall = details.Options.PropagationToken.AsImplOrNull()?.ParentCall ?? CallSafeHandle.NullInstance; var credentials = details.Options.Credentials; using (var nativeCredentials = credentials != null ? credentials.ToNativeCredentials() : null)