1 files changed, 82 insertions, 0 deletions
diff --git a/src/mscorlib/shared/System/ObjectDisposedException.cs b/src/mscorlib/shared/System/ObjectDisposedException.cs
new file mode 100644
index 0000000000..abb7c89dae
--- /dev/null
+++ b/src/mscorlib/shared/System/ObjectDisposedException.cs
@@ -0,0 +1,82 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+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>
+    [Serializable]
+    public class ObjectDisposedException : InvalidOperationException
+    {
+        private String _objectName;
+
+        // This constructor should only be called by the EE (COMPlusThrow)
+        private ObjectDisposedException() :
+            this(null, SR.ObjectDisposed_Generic)
+        {
+        }
+
+        public ObjectDisposedException(String objectName) :
+            this(objectName, SR.ObjectDisposed_Generic)
+        {
+        }
+
+        public ObjectDisposedException(String objectName, String message) : base(message)
+        {
+            HResult = __HResults.COR_E_OBJECTDISPOSED;
+            _objectName = objectName;
+        }
+
+        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
+            {
+                String name = ObjectName;
+                if (name == null || name.Length == 0)
+                    return base.Message;
+
+                String objectDisposed = SR.Format(SR.ObjectDisposed_ObjectName_Name, name);
+                return base.Message + Environment.NewLine + objectDisposed;
+            }
+        }
+
+        public String ObjectName
+        {
+            get
+            {
+                if ((_objectName == null)) // && !CompatibilitySwitches.IsAppEarlierThanWindowsPhone8)
+                {
+                    return String.Empty;
+                }
+                return _objectName;
+            }
+        }
+    }
+}