Bug corrections: on discriminator not found ignore subclass path; als…

…o don't replace already matched subclassMapToUse.
masbicudo · May 9, 2016 · 2732886 · 2732886
1 parent db97e45
commit 2732886
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Fluent-Json.NET-Configuration/JsonMapsConverter.cs b/Fluent-Json.NET-Configuration/JsonMapsConverter.cs
@@ -321,13 +321,15 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                                 subDiscriminatorFieldValue = discriminatorFieldValueToken.Value<string>();
 
                             if (subDiscriminatorFieldValue == null)
-                                throw new Exception($"Discriminator field not found.");
+                                break;
                         }
                     }
                 }
 
-                subclassMapToUse = subclassMapToUse2;
-                if (subclassMapToUse != null && subDiscriminatorFieldValue != null)
+                if (subclassMapToUse2 != null)
+                    subclassMapToUse = subclassMapToUse2;
+
+                if (subclassMapToUse2 != null && subDiscriminatorFieldValue != null)
                     throw new Exception("Value of discriminator field not verified by any subclass map.");
             }