diff options
Diffstat (limited to 'src/mscorlib/src/System/ObjectDisposedException.cs')
-rw-r--r-- | src/mscorlib/src/System/ObjectDisposedException.cs | 79 |
1 files changed, 44 insertions, 35 deletions
diff --git a/src/mscorlib/src/System/ObjectDisposedException.cs b/src/mscorlib/src/System/ObjectDisposedException.cs index d2eca37325..1f77b1f009 100644 --- a/src/mscorlib/src/System/ObjectDisposedException.cs +++ b/src/mscorlib/src/System/ObjectDisposedException.cs @@ -2,72 +2,81 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace System { - using System; - using System.Runtime.Serialization; - using System.Globalization; - using System.Security.Permissions; +using System.Globalization; +using System.Runtime.Serialization; +namespace System +{ /// <devdoc> /// <para> The exception that is thrown when accessing an object that was /// disposed.</para> /// </devdoc> - [System.Runtime.InteropServices.ComVisible(true)] [Serializable] - public class ObjectDisposedException : InvalidOperationException { - private String objectName; + public class ObjectDisposedException : InvalidOperationException + { + private String _objectName; // This constructor should only be called by the EE (COMPlusThrow) - private ObjectDisposedException() : - this(null ,Environment.GetResourceString("ObjectDisposed_Generic")) { + private ObjectDisposedException() : + this(null, SR.ObjectDisposed_Generic) + { } - public ObjectDisposedException(String objectName) : - this(objectName, Environment.GetResourceString("ObjectDisposed_Generic")) { + public ObjectDisposedException(String objectName) : + this(objectName, SR.ObjectDisposed_Generic) + { } - public ObjectDisposedException(String objectName, String message) : base(message) { - SetErrorCode(__HResults.COR_E_OBJECTDISPOSED); - this.objectName = objectName; + public ObjectDisposedException(String objectName, String message) : base(message) + { + HResult = __HResults.COR_E_OBJECTDISPOSED; + _objectName = objectName; } - public ObjectDisposedException(String message, Exception innerException) - : base(message, innerException) { - SetErrorCode(__HResults.COR_E_OBJECTDISPOSED); + public ObjectDisposedException(String message, Exception innerException) + : base(message, innerException) + { + HResult = __HResults.COR_E_OBJECTDISPOSED; + } + + protected ObjectDisposedException(SerializationInfo info, StreamingContext context) + : base(info, context) + { + _objectName = info.GetString("ObjectName"); + } + + public override void GetObjectData(SerializationInfo info, StreamingContext context) + { + base.GetObjectData(info, context); + info.AddValue("ObjectName",ObjectName,typeof(String)); } /// <devdoc> /// <para>Gets the text for the message for this exception.</para> /// </devdoc> - public override String Message { - get { + public override String Message + { + get + { String name = ObjectName; if (name == null || name.Length == 0) return base.Message; - String objectDisposed = Environment.GetResourceString("ObjectDisposed_ObjectName_Name", name); + String objectDisposed = SR.Format(SR.ObjectDisposed_ObjectName_Name, name); return base.Message + Environment.NewLine + objectDisposed; } } - public String ObjectName { - get { - if (objectName == null) + public String ObjectName + { + get + { + if ((_objectName == null)) // && !CompatibilitySwitches.IsAppEarlierThanWindowsPhone8) { return String.Empty; } - return objectName; + return _objectName; } } - - protected ObjectDisposedException(SerializationInfo info, StreamingContext context) : base(info, context) { - objectName = info.GetString("ObjectName"); - } - - public override void GetObjectData(SerializationInfo info, StreamingContext context) { - base.GetObjectData(info, context); - info.AddValue("ObjectName",ObjectName,typeof(String)); - } - } } |