New test.

[mono.git] / mcs / class / System.Runtime.Remoting / System.Runtime.Remoting.Channels.Tcp / TcpClientChannel.cs

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpClientChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpClientChannel.cs
index 04c4e79865007dcac941dd56aaca472f1e954bbd..c460e2e0b3326b5c51ee3f08090c366a2e2f62cb 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpClientChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpClientChannel.cs
@@ -7,6 +7,27 @@
 // 2002 (C) Copyright, Ximian, Inc.
 //
 
+//
+// 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.Net.Sockets;
@@ -24,6 +45,8 @@ namespace System.Runtime.Remoting.Channels.Tcp
                
                public TcpClientChannel ()
                {
+                       _sinkProvider = new BinaryClientFormatterSinkProvider ();
+                       _sinkProvider.Next = new TcpClientTransportSinkProvider ();
                }
 
                public TcpClientChannel (IDictionary properties, IClientChannelSinkProvider sinkProvider)
@@ -79,11 +102,14 @@ namespace System.Runtime.Remoting.Channels.Tcp
                        }
                }
 
-               public IMessageSink CreateMessageSink (string url,
+               public virtual IMessageSink CreateMessageSink (string url,
                                                       object remoteChannelData,
                                                       out string objectURI)
            {
-                       if (url == null && remoteChannelData != null) {
+                       if (url != null && Parse (url, out objectURI) != null)
+                               return (IMessageSink) _sinkProvider.CreateSink (this, url, remoteChannelData);
+                       
+                       if (remoteChannelData != null) {
                                IChannelDataStore ds = remoteChannelData as IChannelDataStore;
                                if (ds != null && ds.ChannelUris.Length > 0)
                                        url = ds.ChannelUris [0];