From 386bbdf1656d567e3636c4e60fec474749b1c8d1 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 13 Dec 2017 02:42:22 +0100 Subject: regenerate --- src/csharp/Grpc.Reflection/Reflection.cs | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'src/csharp/Grpc.Reflection/Reflection.cs') diff --git a/src/csharp/Grpc.Reflection/Reflection.cs b/src/csharp/Grpc.Reflection/Reflection.cs index 86e9aace8c..60090e5364 100644 --- a/src/csharp/Grpc.Reflection/Reflection.cs +++ b/src/csharp/Grpc.Reflection/Reflection.cs @@ -345,7 +345,10 @@ namespace Grpc.Reflection.V1Alpha { FileContainingSymbol = other.FileContainingSymbol; break; case MessageRequestOneofCase.FileContainingExtension: - FileContainingExtension = other.FileContainingExtension; + if (FileContainingExtension == null) { + FileContainingExtension = new global::Grpc.Reflection.V1Alpha.ExtensionRequest(); + } + FileContainingExtension.MergeFrom(other.FileContainingExtension); break; case MessageRequestOneofCase.AllExtensionNumbersOfType: AllExtensionNumbersOfType = other.AllExtensionNumbersOfType; @@ -816,16 +819,28 @@ namespace Grpc.Reflection.V1Alpha { } switch (other.MessageResponseCase) { case MessageResponseOneofCase.FileDescriptorResponse: - FileDescriptorResponse = other.FileDescriptorResponse; + if (FileDescriptorResponse == null) { + FileDescriptorResponse = new global::Grpc.Reflection.V1Alpha.FileDescriptorResponse(); + } + FileDescriptorResponse.MergeFrom(other.FileDescriptorResponse); break; case MessageResponseOneofCase.AllExtensionNumbersResponse: - AllExtensionNumbersResponse = other.AllExtensionNumbersResponse; + if (AllExtensionNumbersResponse == null) { + AllExtensionNumbersResponse = new global::Grpc.Reflection.V1Alpha.ExtensionNumberResponse(); + } + AllExtensionNumbersResponse.MergeFrom(other.AllExtensionNumbersResponse); break; case MessageResponseOneofCase.ListServicesResponse: - ListServicesResponse = other.ListServicesResponse; + if (ListServicesResponse == null) { + ListServicesResponse = new global::Grpc.Reflection.V1Alpha.ListServiceResponse(); + } + ListServicesResponse.MergeFrom(other.ListServicesResponse); break; case MessageResponseOneofCase.ErrorResponse: - ErrorResponse = other.ErrorResponse; + if (ErrorResponse == null) { + ErrorResponse = new global::Grpc.Reflection.V1Alpha.ErrorResponse(); + } + ErrorResponse.MergeFrom(other.ErrorResponse); break; } -- cgit v1.2.3