Merge pull request #2734 from nealef/master

[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 56adef753d3180295cf8efbc6c2d2e21c10fe1ac..162a0fbe0d1b55b1589ca7e5785755759c7e67a7 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting/ObjectHandle.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting/ObjectHandle.cs
@@ -1,42 +1,64 @@
 //
 // System.Runtime.Remoting.ObjectHandle.cs
 //
-// Author:
-//   Dietmar Maurer (dietmr@ximian.com)
+// Authors:
+//   Dietmar Maurer (dietmar@ximian.com)
+//   Gonzalo Paniagua (gonzalo@ximian.com)
+//   Jaime Anguiano Olarra (jaime@gnome.org)
 //
 // (C) Ximian, Inc.  http://www.ximian.com
 //
 //
 
+//
+// 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 {
 
-       public class ObjectHandle : MarshalByRefObject, IObjectReference {
+       [ClassInterface(ClassInterfaceType.AutoDual)]
+       [System.Runtime.InteropServices.ComVisible (true)]
+       public class ObjectHandle : MarshalByRefObject, IObjectHandle {
+               private object _wrapped;
                
-               [MonoTODO]
                public ObjectHandle (object o)
                {
-                       throw new NotImplementedException ();
+                       _wrapped = o;
                }
 
-               [MonoTODO]
                public override object InitializeLifetimeService ()
                {
-                       throw new NotImplementedException ();
+                       return base.InitializeLifetimeService ();
                }
 
-               [MonoTODO]
                public object Unwrap ()
                {
-                       throw new NotImplementedException ();
+                       return _wrapped;
                }
-
-               public object GetRealObject (StreamingContext context)
-               {
-                       throw new NotImplementedException ();
-               }
-
        }
 }
+