Browse Source

Change MessageType != null in IsInitialized to FieldType == Message || Group (#5688)

Sydney Acksman 6 years ago
parent
commit
e7283254d6
1 changed files with 2 additions and 2 deletions
  1. 2 2
      csharp/src/Google.Protobuf/MessageExtensions.cs

+ 2 - 2
csharp/src/Google.Protobuf/MessageExtensions.cs

@@ -163,12 +163,12 @@ namespace Google.Protobuf
                         var map = (IDictionary)f.Accessor.GetValue(message);
                         var map = (IDictionary)f.Accessor.GetValue(message);
                         return map.Values.OfType<IMessage>().All(IsInitialized);
                         return map.Values.OfType<IMessage>().All(IsInitialized);
                     }
                     }
-                    else if (f.IsRepeated && f.MessageType != null)
+                    else if (f.IsRepeated && f.FieldType == FieldType.Message || f.FieldType == FieldType.Group)
                     {
                     {
                         var enumerable = (IEnumerable)f.Accessor.GetValue(message);
                         var enumerable = (IEnumerable)f.Accessor.GetValue(message);
                         return enumerable.Cast<IMessage>().All(IsInitialized);
                         return enumerable.Cast<IMessage>().All(IsInitialized);
                     }
                     }
-                    else if (f.MessageType != null)
+                    else if (f.FieldType == FieldType.Message || f.FieldType == FieldType.Group)
                     {
                     {
                         if (f.Accessor.HasValue(message))
                         if (f.Accessor.HasValue(message))
                         {
                         {