CrossAppDomainChannel.cs: Make _ContextID an object that fixes bug #422491.

[mono.git] / mcs / class / corlib / System.Text / EncodingInfo.cs

diff --git a/mcs/class/corlib/System.Text/EncodingInfo.cs b/mcs/class/corlib/System.Text/EncodingInfo.cs
index a9a45a6398e39e0ce8336788657027a7c7488fe5..262dfe8451e7f32b07ce911b751f9e28b1d49138 100644 (file)
--- a/mcs/class/corlib/System.Text/EncodingInfo.cs
+++ b/mcs/class/corlib/System.Text/EncodingInfo.cs
@@ -1,5 +1,5 @@
 //
-// EncodingInfo.cs
+// System.Text.EncodingInfo.cs
 //
 // Author:
 //     Atsushi Enomoto <atsushi@ximian.com>
@@ -56,13 +56,13 @@ namespace System.Text
                        get {
                                if (encoding == null)
                                        encoding = GetEncoding ();
-                               return encoding.EncodingName;
+                               return encoding.WebName;
                        }
                }
 
-               public override bool Equals (object other)
+               public override bool Equals (object value)
                {
-                       EncodingInfo ei = other as EncodingInfo;
+                       EncodingInfo ei = value as EncodingInfo;
                        return ei != null &&
                                ei.codepage == codepage;
                }