* ChannelServices.cs: Call context management moved to RemotingServices.

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

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting.Channels/ChangeLog
index fade3650e8896907a89c5e127fe1a13e06e43626..aa94cc22431f20fae4f21c401d03241adfdb493c 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Channels/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-11  Lluis Sanchez Gual <lluis@ximian.com>
+
+       * ChannelServices.cs: Call context management moved to RemotingServices.
+
 2003-08-25  Lluis Sanchez Gual <lluis@ximian.com>
 
        * ClientChannelSinkStack.cs: Implemented DispatchException.
@@ -174,4 +178,3 @@
        * *.cs: Added all the interfaces in this namespace.
 
        * ServerProcessing.cs: Added.
-

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/ChannelServices.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/ChannelServices.cs
index 1f7d093d4da6ee473d90bc7d8a719731315fe7c8..f56ce3fc2436c0f248e853dad71f5ff8f3ccc5a0 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Channels/ChannelServices.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/ChannelServices.cs
@@ -190,20 +190,7 @@ namespace System.Runtime.Remoting.Channels
                        if (identity == null) return new ReturnMessage (new RemotingException ("No receiver for uri " + call.Uri), (IMethodCallMessage) msg);
 
                        RemotingServices.SetMessageTargetIdentity (msg, identity);
-
-                       if (call.LogicalCallContext != null)
-                               CallContext.SetCurrentCallContext (call.LogicalCallContext);
-
-                       try
-                       {
-                               IMessage response = _crossContextSink.SyncProcessMessage (msg);
-                               response.Properties ["__CallContext"] = CallContext.CreateLogicalCallContext ();
-                               return response;
-                       }
-                       finally
-                       {
-                               CallContext.ResetCurrentCallContext ();
-                       }
+                       return _crossContextSink.SyncProcessMessage (msg);
                }
 
                public static void UnregisterChannel (IChannel chnl)