Merge pull request #910 from akoeplinger/cleanup-test-ignores

[mono.git] / mcs / class / corlib / System.Resources / RuntimeResourceSet.cs

diff --git a/mcs/class/corlib/System.Resources/RuntimeResourceSet.cs b/mcs/class/corlib/System.Resources/RuntimeResourceSet.cs
index e632af5601d70f437f49f7ea8a21e280c2fb1dbb..35523a133eea89a68bba9fe217eedd82ca69a478 100644 (file)
--- a/mcs/class/corlib/System.Resources/RuntimeResourceSet.cs
+++ b/mcs/class/corlib/System.Resources/RuntimeResourceSet.cs
@@ -35,6 +35,11 @@ namespace System.Resources {
        [Serializable]
        internal class RuntimeResourceSet : ResourceSet {
 
+               // Constructor for Activator.CreateInstance from Silverlight
+               public RuntimeResourceSet (UnmanagedMemoryStream stream) : base (stream)
+               {
+               }
+               
                public RuntimeResourceSet (Stream stream) :
                        base (stream)
                {
@@ -48,7 +53,7 @@ namespace System.Resources {
                public override object GetObject (string name)
                {
                        if (Reader == null)
-                               throw new InvalidOperationException ("ResourceSet is closed.");
+                               throw new ObjectDisposedException ("ResourceSet is closed.");
 
                        return CloneDisposableObjectIfPossible (base.GetObject (name));
                }
@@ -56,7 +61,7 @@ namespace System.Resources {
                public override object GetObject (string name, bool ignoreCase)
                {
                        if (Reader == null)
-                               throw new InvalidOperationException ("ResourceSet is closed.");
+                               throw new ObjectDisposedException ("ResourceSet is closed.");
 
                        return CloneDisposableObjectIfPossible (base.GetObject (name, ignoreCase));
                }