2005-01-31 Zoltan Varga <vargaz@freemail.hu>

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

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/ServerDispatchSink.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/ServerDispatchSink.cs
index db1e58bbd6af4a323a0b01be1553623aee4db385..1cf58332e307417d91f022a49f4f166d2cbf4844 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Channels/ServerDispatchSink.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/ServerDispatchSink.cs
@@ -6,6 +6,29 @@
 // 2002 (C) Copyright, Ximian, Inc.
 //
 
+//
+// 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.Collections;
 using System.IO;
 using System.Runtime.Remoting.Messaging;
@@ -30,18 +53,17 @@ namespace System.Runtime.Remoting.Channels {
                        }
                }
 
-               [MonoTODO]
                public void AsyncProcessResponse (IServerResponseChannelSinkStack sinkStack, object state,
                                                  IMessage msg, ITransportHeaders headers, Stream stream)
                {
-                       throw new NotImplementedException ();
+                       // Never called (this sink does not push itself into the sink stack)
+                       throw new NotSupportedException ();
                }
 
-               [MonoTODO]
                public Stream GetResponseStream (IServerResponseChannelSinkStack sinkStack, object state,
                                                 IMessage msg, ITransportHeaders headers)
                {
-                       throw new NotImplementedException ();
+                       return null;
                }
                
                public ServerProcessing ProcessMessage (IServerChannelSinkStack sinkStack,
@@ -52,19 +74,10 @@ namespace System.Runtime.Remoting.Channels {
                                                        out ITransportHeaders responseHeaders,
                                                        out Stream responseStream)
                {
-                       IMethodCallMessage call = (IMethodCallMessage)requestMsg;
-                       
-                       string uri = (string)requestHeaders ["_requestUri"];
-                       
-                       MarshalByRefObject svr = RemotingServices.GetServerForUri (uri);
-                       if (svr == null)
-                               throw new RemotingException ("no registered server for uri " + uri); 
-
-                       responseMsg = RemotingServices.ExecuteMessage (svr, call);
                        responseHeaders = null;                 
                        responseStream = null;
-                       
-                       return ServerProcessing.Complete;
+
+                       return ChannelServices.DispatchMessage(sinkStack, requestMsg, out responseMsg);
                }
        }
 }