diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-22 22:13:08 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-22 22:13:08 -0800 |
| commit | 5b0fde1a0a2bfa9c2bd39da7285f541a534e65c1 (patch) | |
| tree | 132d08b55131627b9d77e929558404e9330c45ce /src/csharp/Grpc.Core/Marshaller.cs | |
| parent | 89d517c86a7ce072fec93d435b27f5a7903a7f1b (diff) | |
| parent | 914a2e7217e3376dfbd69fa37008d6d60f797689 (diff) | |
Merge github.com:grpc/grpc into hide-the-worker
Diffstat (limited to 'src/csharp/Grpc.Core/Marshaller.cs')
| -rw-r--r-- | src/csharp/Grpc.Core/Marshaller.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/csharp/Grpc.Core/Marshaller.cs b/src/csharp/Grpc.Core/Marshaller.cs index 3493d2d38f..5847248c1a 100644 --- a/src/csharp/Grpc.Core/Marshaller.cs +++ b/src/csharp/Grpc.Core/Marshaller.cs @@ -1,6 +1,6 @@ #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 @@ -51,8 +51,8 @@ namespace Grpc.Core /// <param name="deserializer">Function that will be used to deserialize messages.</param> public Marshaller(Func<T, byte[]> serializer, Func<byte[], T> deserializer) { - this.serializer = Preconditions.CheckNotNull(serializer, "serializer"); - this.deserializer = Preconditions.CheckNotNull(deserializer, "deserializer"); + this.serializer = GrpcPreconditions.CheckNotNull(serializer, "serializer"); + this.deserializer = GrpcPreconditions.CheckNotNull(deserializer, "deserializer"); } /// <summary> |