applied from HEAD

svn path=/branches/mono-1-0/mcs/; revision=39116
mono · Jan 18, 2005 · 631bb74 · 631bb74
1 parent 2c20e28
commit 631bb74
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-18 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* SerializationCodeGenerator.cs: don't use _config if it has not been
+	assigned.
+
 2005-01-13  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* SerializationCodeGenerator.cs : the last merge was wrong. Fixed the

diff --git a/mcs/class/System.XML/System.Xml.Serialization/SerializationCodeGenerator.cs b/mcs/class/System.XML/System.Xml.Serialization/SerializationCodeGenerator.cs
@@ -277,7 +277,7 @@ public void GenerateWriter (string writerClassName, ArrayList maps)
 
 			InitHooks ();
 
-			if (!_config.GenerateAsInternal)
+			if (_config == null || !_config.GenerateAsInternal)
 				WriteLine ("public class " + writerClassName + " : XmlSerializationWriter");
 			else
 				WriteLine ("internal class " + writerClassName + " : XmlSerializationWriter");
@@ -1064,7 +1064,7 @@ void WriteWriteObjectCallback (XmlTypeMapping map)
 
 		public void GenerateReader (string readerClassName, ArrayList maps)
 		{
-			if (!_config.GenerateAsInternal)
+			if (_config == null || !_config.GenerateAsInternal)
 				WriteLine ("public class " + readerClassName + " : XmlSerializationReader");
 			else
 				WriteLine ("internal class " + readerClassName + " : XmlSerializationReader");