Fixed merge errors

darrelmiller · darrelmiller · commit 806c067b55fc · 2018-05-20T19:02:48.000-04:00
diff --git a/src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs b/src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs
@@ -153,9 +153,11 @@ private void ValidateDocument(OpenApiDiagnostic diagnostic, OpenApiDocument docu
             if (_settings.RuleSet != null && _settings.RuleSet.Rules.Count > 0)
             {
                 var errors = document.Validate(_settings.RuleSet);
-                diagnostic.Errors.Add(errors);
+                foreach (var item in errors)
+                {
+                    diagnostic.Errors.Add(item);
+                }
             }
-            return document;
         }
 
         /// <summary>
@@ -196,7 +198,7 @@ public T ReadFragment<T>(Stream input, OpenApiSpecVersion version, out OpenApiDi
             }
             catch (OpenApiException ex)
             {
-                diagnostic.Errors.Add(new OpenApiError(ex));
+                diagnostic.Errors.Add(new OpenApiReaderError(ex));
             }
 
             // Validate the element

Original file line number	Diff line number	Diff line change
`@@ -153,9 +153,11 @@ private void ValidateDocument(OpenApiDiagnostic diagnostic, OpenApiDocument docu`
`153`	`153`	`if (_settings.RuleSet != null && _settings.RuleSet.Rules.Count > 0)`
`154`	`154`	`{`
`155`	`155`	`var errors = document.Validate(_settings.RuleSet);`
`156`		`- diagnostic.Errors.Add(errors);`
	`156`	`+ foreach (var item in errors)`
	`157`	`+ {`
	`158`	`+ diagnostic.Errors.Add(item);`
	`159`	`+ }`
`157`	`160`	`}`
`158`		`- return document;`
`159`	`161`	`}`
`160`	`162`
`161`	`163`	`/// <summary>`
`@@ -196,7 +198,7 @@ public T ReadFragment<T>(Stream input, OpenApiSpecVersion version, out OpenApiDi`
`196`	`198`	`}`
`197`	`199`	`catch (OpenApiException ex)`
`198`	`200`	`{`
`199`		`- diagnostic.Errors.Add(new OpenApiError(ex));`
	`201`	`+ diagnostic.Errors.Add(new OpenApiReaderError(ex));`
`200`	`202`	`}`
`201`	`203`
`202`	`204`	`// Validate the element`