diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-22 22:29:51 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-22 22:29:51 -0800 |
| commit | 70ab4c5cef079518f5b5a6a7e4b45e3d0f61c6f1 (patch) | |
| tree | 91b5028c4a2b6dd0f2798f13ac48515800e373d2 /src/csharp/Grpc.Core/Channel.cs | |
| parent | 023759216c4efa34440deb2e7516d1cc9e5b278f (diff) | |
| parent | 914a2e7217e3376dfbd69fa37008d6d60f797689 (diff) | |
Merge github.com:grpc/grpc into fix-proto-docker
Diffstat (limited to 'src/csharp/Grpc.Core/Channel.cs')
| -rw-r--r-- | src/csharp/Grpc.Core/Channel.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/csharp/Grpc.Core/Channel.cs b/src/csharp/Grpc.Core/Channel.cs index d8d43c7998..d7a482d86f 100644 --- a/src/csharp/Grpc.Core/Channel.cs +++ b/src/csharp/Grpc.Core/Channel.cs @@ -1,5 +1,5 @@ #region Copyright notice and license -// Copyright 2015, Google Inc. +// Copyright 2015-2016, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -68,7 +68,7 @@ namespace Grpc.Core /// <param name="options">Channel options.</param> public Channel(string target, ChannelCredentials credentials, IEnumerable<ChannelOption> options = null) { - this.target = Preconditions.CheckNotNull(target, "target"); + this.target = GrpcPreconditions.CheckNotNull(target, "target"); this.options = CreateOptionsDictionary(options); EnsureUserAgentChannelOption(this.options); this.environment = GrpcEnvironment.AddRef(); @@ -117,7 +117,7 @@ namespace Grpc.Core /// </summary> public Task WaitForStateChangedAsync(ChannelState lastObservedState, DateTime? deadline = null) { - Preconditions.CheckArgument(lastObservedState != ChannelState.FatalFailure, + GrpcPreconditions.CheckArgument(lastObservedState != ChannelState.FatalFailure, "FatalFailure is a terminal state. No further state changes can occur."); var tcs = new TaskCompletionSource<object>(); var deadlineTimespec = deadline.HasValue ? Timespec.FromDateTime(deadline.Value) : Timespec.InfFuture; @@ -184,7 +184,7 @@ namespace Grpc.Core { lock (myLock) { - Preconditions.CheckState(!shutdownRequested); + GrpcPreconditions.CheckState(!shutdownRequested); shutdownRequested = true; } @@ -221,7 +221,7 @@ namespace Grpc.Core bool success = false; handle.DangerousAddRef(ref success); - Preconditions.CheckState(success); + GrpcPreconditions.CheckState(success); } internal void RemoveCallReference(object call) |