From 9afbbceb72bf047c3635578b6571c368706e009a Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Tue, 28 Jul 2009 05:04:08 +0000 Subject: [PATCH] 2009-07-28 Miguel de Icaza * UTF8Encoding.cs: Use Equals to compare the objects as the fallback objects do not overload operator ==. The comparison was previously failing. svn path=/trunk/mcs/; revision=138786 --- mcs/class/corlib/System.Text/ChangeLog | 6 ++++++ mcs/class/corlib/System.Text/UTF8Encoding.cs | 6 +++--- mcs/class/corlib/Test/System.Text/UTF8EncodingTest.cs | 6 ++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/mcs/class/corlib/System.Text/ChangeLog b/mcs/class/corlib/System.Text/ChangeLog index 144686053c4..06776774883 100644 --- a/mcs/class/corlib/System.Text/ChangeLog +++ b/mcs/class/corlib/System.Text/ChangeLog @@ -1,3 +1,9 @@ +2009-07-28 Miguel de Icaza + + * UTF8Encoding.cs: Use Equals to compare the objects as the + fallback objects do not overload operator ==. The comparison + was previously failing. + 2009-07-26 Gonzalo Paniagua Javier * StringBuilder.cs: don't throw on null values in ctor(string, int). diff --git a/mcs/class/corlib/System.Text/UTF8Encoding.cs b/mcs/class/corlib/System.Text/UTF8Encoding.cs index 27dc336e36e..cf4c66046f8 100644 --- a/mcs/class/corlib/System.Text/UTF8Encoding.cs +++ b/mcs/class/corlib/System.Text/UTF8Encoding.cs @@ -1019,9 +1019,9 @@ fail_no_space: if (enc != null) { #if NET_2_0 return (codePage == enc.codePage && - emitIdentifier == enc.emitIdentifier && - DecoderFallback == enc.DecoderFallback && - EncoderFallback == enc.EncoderFallback); + emitIdentifier == enc.emitIdentifier && + DecoderFallback.Equals (enc.DecoderFallback) && + EncoderFallback.Equals (enc.EncoderFallback)); #else return (codePage == enc.codePage && emitIdentifier == enc.emitIdentifier && diff --git a/mcs/class/corlib/Test/System.Text/UTF8EncodingTest.cs b/mcs/class/corlib/Test/System.Text/UTF8EncodingTest.cs index f4fb2f2dabc..66085bca2cb 100644 --- a/mcs/class/corlib/Test/System.Text/UTF8EncodingTest.cs +++ b/mcs/class/corlib/Test/System.Text/UTF8EncodingTest.cs @@ -59,6 +59,12 @@ namespace MonoTests.System.Text Assert.IsTrue (utf8.IsMailNewsSave); } + [Test] + public void TestCompat () + { + Assert.IsTrue (new UTF8Encoding ().Equals (new UTF8Encoding ())); + } + [Test] public void TestEncodingGetBytes1() { -- 2.25.1