2008-01-25 Zoltan Varga <vargaz@gmail.com>

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

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpChannel.cs
index 7fc26b866ca796dcf8737f630ab413c5a8b2318e..2974071b1d039884751dd6a1f19a3bf802240a98 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpChannel.cs
@@ -36,36 +36,39 @@ namespace System.Runtime.Remoting.Channels.Tcp
 {
        public class TcpChannel : IChannelReceiver, IChannel, IChannelSender
        {
-               private TcpClientChannel _clientChannel;\r
-               private TcpServerChannel _serverChannel = null;\r
-               private string _name = "tcp";\r
+               private TcpClientChannel _clientChannel;
+               private TcpServerChannel _serverChannel = null;
+               private string _name = "tcp";
                private int _priority = 1;
        
-               public TcpChannel (): this (0)
+               public TcpChannel ()
         {
+                       Init (new Hashtable(), null, null);
                }
 
                public TcpChannel (int port)
                {
-                       Hashtable ht = new Hashtable();\r
-                       ht["port"] = port.ToString();\r
-                       Init(ht, null, null);\r
+                       Hashtable ht = new Hashtable();
+                       ht["port"] = port.ToString();
+                       Init(ht, null, null);
                }
 
-               void Init (IDictionary properties, IClientChannelSinkProvider clientSink, IServerChannelSinkProvider serverSink)\r
-               {\r
-                       _clientChannel = new TcpClientChannel (properties,clientSink);\r
+               void Init (IDictionary properties, IClientChannelSinkProvider clientSink, IServerChannelSinkProvider serverSink)
+               {
+                       _clientChannel = new TcpClientChannel (properties,clientSink);
+
+                       if (properties != null) {
+                               if(properties["port"] != null)
+                                       _serverChannel = new TcpServerChannel(properties, serverSink);
 
-                       if(properties["port"] != null)\r
-                               _serverChannel = new TcpServerChannel(properties, serverSink);\r
-\r
-                       object val = properties ["name"];
-                       if (val != null) _name = val as string;
+                               object val = properties ["name"];
+                               if (val != null) _name = val as string;
                        
-                       val = properties ["priority"];
-                       if (val != null) _priority = Convert.ToInt32 (val);
-               }\r
-\r
+                               val = properties ["priority"];
+                               if (val != null) _priority = Convert.ToInt32 (val);
+                       }
+               }
+
 
                public TcpChannel (IDictionary properties,
                                   IClientChannelSinkProvider clientSinkProvider,
@@ -74,46 +77,46 @@ namespace System.Runtime.Remoting.Channels.Tcp
                        Init (properties, clientSinkProvider, serverSinkProvider);
                }
 
-               public IMessageSink CreateMessageSink(string url, object remoteChannelData, out string objectURI)\r
-               {\r
-                       return _clientChannel.CreateMessageSink(url, remoteChannelData, out objectURI);\r
-               }\r
-\r
-               public string ChannelName\r
-               {\r
-                       get { return _name; }\r
-               }\r
-\r
-               public int ChannelPriority\r
-               {\r
-                       get { return _priority; }\r
-               }\r
-\r
-               public void StartListening (object data)\r
-               {\r
-                       if (_serverChannel != null) _serverChannel.StartListening (data);\r
-               }\r
-               \r
-               public void StopListening (object data)\r
-               {\r
-                       if (_serverChannel != null) _serverChannel.StopListening(data);\r
-                       TcpConnectionPool.Shutdown ();\r
-               }\r
-\r
-               public string[] GetUrlsForUri (string uri)\r
-               {\r
-                       if (_serverChannel != null) return _serverChannel.GetUrlsForUri(uri);\r
-                       else return null;\r
-               }\r
-\r
-               public object ChannelData\r
-               {\r
-                       get \r
-                       {\r
-                               if (_serverChannel != null) return _serverChannel.ChannelData;\r
-                               else return null;\r
-                       }\r
-               }\r
+               public IMessageSink CreateMessageSink(string url, object remoteChannelData, out string objectURI)
+               {
+                       return _clientChannel.CreateMessageSink(url, remoteChannelData, out objectURI);
+               }
+
+               public string ChannelName
+               {
+                       get { return _name; }
+               }
+
+               public int ChannelPriority
+               {
+                       get { return _priority; }
+               }
+
+               public void StartListening (object data)
+               {
+                       if (_serverChannel != null) _serverChannel.StartListening (data);
+               }
+               
+               public void StopListening (object data)
+               {
+                       if (_serverChannel != null) _serverChannel.StopListening(data);
+                       TcpConnectionPool.Shutdown ();
+               }
+
+               public string[] GetUrlsForUri (string uri)
+               {
+                       if (_serverChannel != null) return _serverChannel.GetUrlsForUri(uri);
+                       else return null;
+               }
+
+               public object ChannelData
+               {
+                       get 
+                       {
+                               if (_serverChannel != null) return _serverChannel.ChannelData;
+                               else return null;
+                       }
+               }
 
                public string Parse (string url, out string objectURI)
                {