merge -r 60439:60440

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

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/EnvoyTerminatorSink.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/EnvoyTerminatorSink.cs
index 4e204819e1861a60fd98a89958040daca03ca61e..4388c16c8152e42926ee8cfa3eed73d900bb863d 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/EnvoyTerminatorSink.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/EnvoyTerminatorSink.cs
@@ -5,21 +5,43 @@
 //
 // (C) 2003, Lluis Sanchez Gual
 //\r
+
+//
+// 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.
+//
 \r
 using System;\r
 using System.Threading;\r
 \r
 namespace System.Runtime.Remoting.Messaging\r
 {\r
+       [Serializable]\r
        internal class EnvoyTerminatorSink: IMessageSink\r
        {\r
                public static EnvoyTerminatorSink Instance = new EnvoyTerminatorSink();\r
 \r
                public IMessage SyncProcessMessage (IMessage msg)
                {
-//                     FIXME: restore when Thread.CurrentContext workds
-//                     return Thread.CurrentContext.GetClientContextSinkChain ().SyncProcessMessage (msg);
-                       return System.Runtime.Remoting.Contexts.Context.DefaultContext.GetClientContextSinkChain ().SyncProcessMessage (msg);
+                       return Thread.CurrentContext.GetClientContextSinkChain ().SyncProcessMessage (msg);
                }
 
                public IMessageCtrl AsyncProcessMessage (IMessage msg, IMessageSink replySink)