Преглед на файлове

2004-08-20 Atsushi Enomoto <[email protected]>

	* XsdValidatingReader.cs : ReadTypedValue() is override under 2_0.

svn path=/trunk/mcs/; revision=32559
Atsushi Eno преди 21 години
родител
ревизия
a626f878cd
променени са 2 файла, в които са добавени 9 реда и са изтрити 1 реда
  1. 4 0
      mcs/class/System.XML/Mono.Xml.Schema/ChangeLog
  2. 5 1
      mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs

+ 4 - 0
mcs/class/System.XML/Mono.Xml.Schema/ChangeLog

@@ -1,3 +1,7 @@
+2004-08-20  Atsushi Enomoto  <[email protected]>
+
+	* XsdValidatingReader.cs : ReadTypedValue() is override under 2_0.
+
 2004-08-10  Atsushi Enomoto <[email protected]>
 
 	* XsdValidatingReader.cs : replaced XmlSchemaCollection with

+ 5 - 1
mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs

@@ -213,7 +213,11 @@ namespace Mono.Xml.Schema
 		}
 
 		// It is used only for independent XmlReader use, not for XmlValidatingReader.
+#if NET_2_0
+		public override object ReadTypedValue ()
+#else
 		public object ReadTypedValue ()
+#endif
 		{
 			XmlSchemaDatatype dt = SchemaType as XmlSchemaDatatype;
 			XmlSchemaSimpleType st = SchemaType as XmlSchemaSimpleType;
@@ -243,7 +247,7 @@ namespace Mono.Xml.Schema
 						loop = false;
 						break;
 					}
-				} while (loop && !EOF);
+				} while (loop && !EOF && ReadState == ReadState.Interactive);
 				return dt.ParseValue (storedCharacters.ToString (), NameTable, ParserContext.NamespaceManager);
 			case XmlNodeType.Attribute:
 				return dt.ParseValue (Value, NameTable, ParserContext.NamespaceManager);