2002-11-29 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* MarshalByRefObject.cs: undo latest changes. It breaks the build by
	some obscure reasons (try make -f makefile.gnu using a corlib which has
	the modified version).

svn path=/trunk/mcs/; revision=9263

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index 3d6414a63e4ea3909796edbe47aaaf80d51a4fed..6e23cdba2c3d8cbf5955aa871214b328d6e236ed 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-29  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * MarshalByRefObject.cs: undo latest changes. It breaks the build by
+       some obscure reasons (try make -f makefile.gnu using a corlib which has
+       the modified version).
+
 2002-11-26  Miguel de Icaza  <miguel@ximian.com>
 
        * String.cs (Concat): Reduce the number of compares required. 

diff --git a/mcs/class/corlib/System/MarshalByRefObject.cs b/mcs/class/corlib/System/MarshalByRefObject.cs
index f2d848117bed81d51a8c5c767f34d3c8de70c9b0..d09394b1429010ba883035cf46ee59af91288114 100644 (file)
--- a/mcs/class/corlib/System/MarshalByRefObject.cs
+++ b/mcs/class/corlib/System/MarshalByRefObject.cs
@@ -3,49 +3,32 @@
 //
 // Author:
 //   Miguel de Icaza (miguel@ximian.com)
-//   Jaime Anguiano Olarra (jaime@gnome.org)
 //
 // (C) Ximian, Inc.  http://www.ximian.com
 //
 
 using System.Runtime.Remoting;
-using System.Runtime.Remoting.Lifetime;
 
 namespace System {
 
        [Serializable]
        public abstract class MarshalByRefObject {
-               private object life_ctrl;
-               private ILease ilife_ctrl;
 
-               [MonoTODO]
                public virtual ObjRef CreateObjRef (Type type)
                {
                        throw new NotImplementedException ();
                }
 
-               // LAME SPEC??: It does not say what happens if there is not a current lifetime
-               // server object. Should we return null or throw an exception?.
                public object GetLifetimeService ()
                {
-                       return ilife_ctrl;
+                       return null;
                }
 
-               [MonoTODO]
                public virtual object InitializeLifetimeService ()
                {
-                       life_ctrl = new object ();
-                       ilife_ctrl = life_ctrl as ILease;
-                       
-                       if (ilife_ctrl.CurrentState == LeaseState.Initial) 
-                               ilife_ctrl.InitialLeaseTime = new TimeSpan ((long) 0);
-                       else 
-                               ilife_ctrl.InitialLeaseTime = LifetimeServices.LeaseManagerPollTime;
-
-                       return ilife_ctrl;
+                       return null;
                }
 
-               [MonoTODO]
                protected MarshalByRefObject ()
                {
                }