Merge pull request #409 from Alkarex/patch-1

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

diff --git a/mcs/class/corlib/System.Text/DecoderFallback.cs b/mcs/class/corlib/System.Text/DecoderFallback.cs
index 7cf071c8353265db0e064b924b3fd8e915a9537a..c5ffe76aaa046a2ba62bb408c8fea1485d514165 100644 (file)
--- a/mcs/class/corlib/System.Text/DecoderFallback.cs
+++ b/mcs/class/corlib/System.Text/DecoderFallback.cs
@@ -28,17 +28,17 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
 namespace System.Text
 {
        [Serializable]
        public abstract class DecoderFallback
        {
-               static DecoderFallback exception_fallback =
+               static readonly DecoderFallback exception_fallback =
                        new DecoderExceptionFallback ();
-               static DecoderFallback replacement_fallback =
+               static readonly DecoderFallback replacement_fallback =
                        new DecoderReplacementFallback ();
+               static readonly DecoderFallback standard_safe_fallback =
+                       new DecoderReplacementFallback ("\uFFFD");
 
                protected DecoderFallback ()
                {
@@ -54,8 +54,10 @@ namespace System.Text
                        get { return replacement_fallback; }
                }
 
+               internal static DecoderFallback StandardSafeFallback {
+                       get { return standard_safe_fallback; }
+               }
+
                public abstract DecoderFallbackBuffer CreateFallbackBuffer ();
        }
 }
-
-#endif