2005-05-31 Lluis Sanchez Gual <lluis@novell.com>

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

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/StackBuilderSink.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/StackBuilderSink.cs
index 4eefa77eb16b3bd2045bc1d199aab2311e59d66c..6b2e80db5e0fa4ebcf218bc034df26291e6ceed7 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/StackBuilderSink.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/StackBuilderSink.cs
@@ -6,21 +6,48 @@
 // (C) 2002, Lluis Sanchez Gual
 //
 
+//
+// 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.Threading;
 using System.Reflection;
+using System.Runtime.Remoting.Proxies;
 
 namespace System.Runtime.Remoting.Messaging
 {
        // Sink that calls the real method of the object
 
-       public class StackBuilderSink: IMessageSink
+       internal class StackBuilderSink: IMessageSink
        {
                MarshalByRefObject _target;
+               RealProxy _rp;
 
-               public StackBuilderSink (MarshalByRefObject obj)
+               public StackBuilderSink (MarshalByRefObject obj, bool forceInternalExecute)
                {
                        _target = obj;
+                       if (!forceInternalExecute && RemotingServices.IsTransparentProxy (obj))
+                               _rp = RemotingServices.GetRealProxy (obj);
                }
 
                public IMessage SyncProcessMessage (IMessage msg)
@@ -28,7 +55,8 @@ namespace System.Runtime.Remoting.Messaging
                        CheckParameters (msg);
 
                        // Makes the real call to the object
-                       return RemotingServices.InternalExecuteMessage (_target, (IMethodCallMessage)msg);
+                       if (_rp != null) return _rp.Invoke (msg);
+                       else return RemotingServices.InternalExecuteMessage (_target, (IMethodCallMessage)msg);
                }
 
                public IMessageCtrl AsyncProcessMessage (IMessage msg, IMessageSink replySink)
@@ -45,7 +73,10 @@ namespace System.Runtime.Remoting.Messaging
                        IMessageSink replySink = (IMessageSink)parms[1];
                        
                        CheckParameters (msg);
-                       IMessage res = RemotingServices.InternalExecuteMessage (_target, msg);
+                       
+                       IMessage res;
+                       if (_rp != null) res = _rp.Invoke (msg);
+                       else res = RemotingServices.InternalExecuteMessage (_target, msg);
                        
                        replySink.SyncProcessMessage (res);
                }