2010-06-14 Atsushi Enomoto <atsushi@ximian.com>

[mono.git] / mcs / class / System.XML / System.Xml.Schema / XmlSchemaValidator.cs

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs
index c424345182776862ac64eb3735d1686a5849728f..04faed0ea0ed633c94fb6f5444cbb890885de8ec 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs
@@ -599,6 +599,8 @@ namespace System.Xml.Schema
                private void HandleError (string message,
                        Exception innerException, bool isWarning)
                {
+                       if (current_info != null)
+                               current_info.Validity = XmlSchemaValidity.Invalid;
                        if (isWarning && IgnoreWarnings)
                                return;
 
@@ -640,7 +642,7 @@ namespace System.Xml.Schema
                        if (current_info != null)
                                throw new InvalidOperationException ("Not allowed concurrent call to validation method");
                        current_info = info;
-                       if (info != null)
+                       if (info != null && info.Validity == XmlSchemaValidity.NotKnown)
                                current_info.Validity = XmlSchemaValidity.Valid;
                }