2002-07-26 Tim Coleman <tim@timcoleman.com>

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

diff --git a/mcs/class/System.XML/System.Xml/XmlCharacterData.cs b/mcs/class/System.XML/System.Xml/XmlCharacterData.cs
index ee97aff170fab667e2f2c5f3379e6a37fcc9ca9d..bdd3612bb6cd33629dcb4900cc3ffc8734646436 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlCharacterData.cs
+++ b/mcs/class/System.XML/System.Xml/XmlCharacterData.cs
@@ -20,6 +20,9 @@ namespace System.Xml
                protected internal XmlCharacterData (string data, XmlDocument doc)
                        : base (doc)
                {
+                       if (data == null)
+                               data = String.Empty;
+
                        this.data = data;
                }
 
@@ -39,14 +42,19 @@ namespace System.Xml
                        set { data = value; }
                }
 
-               public int Length {
+               public virtual int Length {
                        get { return data != null ? data.Length : 0; }
                }
 
                public override string Value {
                        get { return data; }
 
-                       set { data = value; }
+                       set {
+                               if (IsReadOnly)
+                                       throw new ArgumentException ("Node is read-only.");
+
+                               data = value;
+                       }
                }
 
                #endregion
@@ -79,7 +87,7 @@ namespace System.Xml
 
                public virtual string Substring (int offset, int count)
                {
-                       return new data.SubString (offset, count);
+                       return data.Substring (offset, count);
                }
 
                #endregion