2005-03-07 Atsushi Enomoto <atsushi@ximian.com>

	* DTDValidatingReader.cs : reverted one change in r40985. Entity stack
	  is nothing to do with ReadAttributeValue().

svn path=/trunk/mcs/; revision=41511

diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog
index 3200bfd45c556a07ea74aabfe61cad4ca3a51c13..b24fdccc98cbef464465970b0866e3a58d6be155 100644 (file)
--- a/mcs/class/System.XML/System.Xml/ChangeLog
+++ b/mcs/class/System.XML/System.Xml/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-07  Atsushi Enomoto <atsushi@ximian.com>
+
+       * DTDValidatingReader.cs : reverted one change in r40985. Entity stack
+         is nothing to do with ReadAttributeValue().
+
 2005-03-07  Atsushi Enomoto <atsushi@ximian.com>
 
        * DTDValidatingReader.cs : When there was actual attribute in source 

diff --git a/mcs/class/System.XML/System.Xml/DTDValidatingReader.cs b/mcs/class/System.XML/System.Xml/DTDValidatingReader.cs
index 5743e11f6c6e104d59d21874c79d87870df0a615..57e974e052e00e638b34b2a6bca63bdb07891e59 100644 (file)
--- a/mcs/class/System.XML/System.Xml/DTDValidatingReader.cs
+++ b/mcs/class/System.XML/System.Xml/DTDValidatingReader.cs
@@ -903,7 +903,7 @@ namespace Mono.Xml
                        if (consumedAttribute)
                                return false;
                        if (NodeType == XmlNodeType.Attribute &&
-                                       entityReaderStack.Count > 0 && currentEntityHandling == EntityHandling.ExpandEntities) {
+                                       currentEntityHandling == EntityHandling.ExpandEntities) {
                                consumedAttribute = true;
                                return true;
                        }