This commit was manufactured by cvs2svn to create branch 'mono-1-0'.

[mono.git] / mcs / class / corlib / System.Runtime.Serialization.Formatters.Binary / ObjectWriter.cs

diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectWriter.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectWriter.cs
index b21a617bb341c0dcd41457df68ac35331eb246be..11f382914cc9a9b64365dce8e9c363e6210f92d9 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectWriter.cs
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectWriter.cs
@@ -357,7 +357,10 @@ namespace System.Runtime.Serialization.Formatters.Binary
 \r
                        // Check if the object is marked with the Serializable attribute\r
 \r
-                       BinaryCommon.CheckSerializable (instanceType, _surrogateSelector, _context);\r
+                       if (!instanceType.IsSerializable)\r
+                               throw new SerializationException ("Type " + instanceType +\r
+                                                                 " is not marked as Serializable " + \r
+                                                                 "and does not implement ISerializable.");\r
 \r
                        ISerializable ser = obj as ISerializable;\r
 \r
@@ -650,7 +653,6 @@ namespace System.Runtime.Serialization.Formatters.Binary
                {\r
                        if (val == null) \r
                        {\r
-                               BinaryCommon.CheckSerializable (valueType, _surrogateSelector, _context);\r
                                writer.Write ((byte) BinaryElement.NullValue);\r
                        }\r
                        else if (BinaryCommon.IsPrimitive(val.GetType()))\r