merging the Mainsoft branch to the trunk

[mono.git] / mcs / class / corlib / System.Runtime.Remoting / ObjectHandle.cs

diff --git a/mcs/class/corlib/System.Runtime.Remoting/ObjectHandle.cs b/mcs/class/corlib/System.Runtime.Remoting/ObjectHandle.cs
index 19d39a02c3beb12b685591ccdd4dc10353e30be8..9403876a18cdf326b827240a74273c2b1a1a9087 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting/ObjectHandle.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting/ObjectHandle.cs
@@ -10,43 +10,54 @@
 //
 //
 
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;
 using System.Runtime.Serialization;
 using System.Runtime.Remoting.Lifetime;
+using System.Runtime.InteropServices;
 
 namespace System.Runtime.Remoting {
 
+       [ClassInterface(ClassInterfaceType.AutoDual)]
        public class ObjectHandle : MarshalByRefObject, IObjectHandle {
                private object _wrapped;
-               private object life_ctrl;
                
                public ObjectHandle (object o)
                {
                        _wrapped = o;
                }
 
-               [MonoTODO]
                public override object InitializeLifetimeService ()
                {
-                       life_ctrl = base.InitializeLifetimeService ();
-                       ILease ilife_ctrl = life_ctrl as ILease;
-                       
-                       if (ilife_ctrl != null)
-
-                               // I can't see in the .NET docs if the lifetime counter
-                               // must be initialized to the time the object is created
-                               // or if a relativistic time is enough (as both differ in
-                               // fact just in a constant. In the meantime I'll use 0.
-                       
-                               ilife_ctrl.InitialLeaseTime = new TimeSpan ((long) 0);
-                       
-                       return ilife_ctrl;
+                       return base.InitializeLifetimeService ();
                }
 
                public object Unwrap ()
                {
                        return _wrapped;
                }
-
        }
 }
+