Merge pull request #1156 from felfert/master

[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 2baba9b7dc831b32f0e8b9d6e6aacf575c5948a1..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,11 +53,7 @@ namespace System.Resources {
                public override object GetObject (string name)
                {
                        if (Reader == null)
-#if NET_2_0
                                throw new ObjectDisposedException ("ResourceSet is closed.");
-#else
-                               throw new InvalidOperationException ("ResourceSet is closed.");
-#endif
 
                        return CloneDisposableObjectIfPossible (base.GetObject (name));
                }
@@ -60,11 +61,7 @@ namespace System.Resources {
                public override object GetObject (string name, bool ignoreCase)
                {
                        if (Reader == null)
-#if NET_2_0
                                throw new ObjectDisposedException ("ResourceSet is closed.");
-#else
-                               throw new InvalidOperationException ("ResourceSet is closed.");
-#endif
 
                        return CloneDisposableObjectIfPossible (base.GetObject (name, ignoreCase));
                }