fixes from code review

6 years ago · 222dd9f340
parent 50854e9521
commit 222dd9f340
2 changed files with 2 additions and 2 deletions
--- 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)
                {
--- 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)