Fix ConsulRequest json deserialization when propertyName is null

Pliner · Feb 22, 2018 · 290e4cf · 290e4cf
1 parent 934ba07
commit 290e4cf
Showing 1 changed file with 21 additions and 19 deletions.
diff --git a/Consul/Utilities/JsonConverters.cs b/Consul/Utilities/JsonConverters.cs
@@ -91,31 +91,33 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                 {
                     string jsonPropName = reader.Value.ToString();
                     var propName = objProps.Value.FirstOrDefault(p => p.Equals(jsonPropName, StringComparison.OrdinalIgnoreCase));
-
-                    PropertyInfo pi = result.GetType().GetRuntimeProperty(propName);
-
-                    if (jsonPropName.Equals("Flags", StringComparison.OrdinalIgnoreCase))
+                    if (propName != null)
                     {
-                        if (!string.IsNullOrEmpty(reader.ReadAsString()))
+                        PropertyInfo pi = result.GetType().GetRuntimeProperty(propName);
+
+                        if (jsonPropName.Equals("Flags", StringComparison.OrdinalIgnoreCase))
                         {
-                            var val = Convert.ToUInt64(reader.Value);
-                            pi.SetValue(result, val, null);
+                            if (!string.IsNullOrEmpty(reader.ReadAsString()))
+                            {
+                                var val = Convert.ToUInt64(reader.Value);
+                                pi.SetValue(result, val, null);
+                            }
                         }
-                    }
-                    else if (jsonPropName.Equals("Value", StringComparison.OrdinalIgnoreCase))
-                    {
-                        if (!string.IsNullOrEmpty(reader.ReadAsString()))
+                        else if (jsonPropName.Equals("Value", StringComparison.OrdinalIgnoreCase))
                         {
-                            var val = Convert.FromBase64String(reader.Value.ToString());
-                            pi.SetValue(result, val, null);
+                            if (!string.IsNullOrEmpty(reader.ReadAsString()))
+                            {
+                                var val = Convert.FromBase64String(reader.Value.ToString());
+                                pi.SetValue(result, val, null);
+                            }
                         }
-                    }
-                    else
-                    {
-                        if (reader.Read())
+                        else
                         {
-                            var convertedValue = Convert.ChangeType(reader.Value, pi.PropertyType);
-                            pi.SetValue(result, convertedValue, null);
+                            if (reader.Read())
+                            {
+                                var convertedValue = Convert.ChangeType(reader.Value, pi.PropertyType);
+                                pi.SetValue(result, convertedValue, null);
+                            }
                         }
                     }
                 }