[corlib] Fixed StringBuilder construction bugs in marshalling caused by changes to...

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

diff --git a/mcs/class/corlib/System.Resources/ResourceSet.cs b/mcs/class/corlib/System.Resources/ResourceSet.cs
index f7621e60ba1eec89ad642713fa6cc92af3d45b46..5c27fc51a8f184017e98153c352818ef0dcbe916 100644 (file)
--- a/mcs/class/corlib/System.Resources/ResourceSet.cs
+++ b/mcs/class/corlib/System.Resources/ResourceSet.cs
@@ -41,21 +41,12 @@ namespace System.Resources
        [ComVisible (true)]
        public class ResourceSet : IDisposable, IEnumerable
        {
-#if !MOONLIGHT
                [NonSerialized]
-#endif
                protected IResourceReader Reader;
                protected Hashtable Table;
                bool resources_read;
                [NonSerialized] Hashtable table_nocase;
 
-               [NonSerialized]
-               private bool disposed;
-
-               internal bool IsDisposed {
-                       get { return disposed || Reader == null; }
-               }
-               
                // Constructors
                protected ResourceSet ()
                {
@@ -70,6 +61,12 @@ namespace System.Resources
                        Table = new Hashtable ();
                        Reader = reader;
                }
+               
+               internal bool IsDisposed {
+                       get {
+                               return Table == null;
+                       }
+               }
 
                [SecurityPermission (SecurityAction.LinkDemand, SerializationFormatter = true)]
                public ResourceSet (Stream stream)
@@ -113,7 +110,6 @@ namespace System.Resources
                        Reader = null;
                        Table = null;
                        table_nocase = null;
-                       disposed = true;
                }
 
                public virtual Type GetDefaultReader ()