2009-07-10 Atsushi Enomoto <atsushi@ximian.com>

	* TcpChannelListener.cs, TcpDuplexSessionChannel.cs : do not pass
	  timeout to channel constructor. it does not make sense.

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
index dbf1d53d3309f756f4b3f2f38ff54b96135aa983..6694db63e306f8e0d2abf8727a8e7061ea2754d1 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-10  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * TcpChannelListener.cs, TcpDuplexSessionChannel.cs : do not pass
+         timeout to channel constructor. it does not make sense.
+
 2009-07-10  Atsushi Enomoto  <atsushi@ximian.com>
 
        * PeerChannelFactory.cs, PeerChannelListener.cs : add MessageEncoder

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TcpChannelListener.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TcpChannelListener.cs
index 0134336df02d5c40777893598462a06aaffb7f5f..c13ada5ca29069703c6ac3464dc57236149bdb61 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TcpChannelListener.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TcpChannelListener.cs
@@ -84,7 +84,7 @@ namespace System.ServiceModel.Channels
                                return null; // onclose
 
                        if (typeof (TChannel) == typeof (IDuplexSessionChannel))
-                               return (TChannel) (object) new TcpDuplexSessionChannel (this, info, client, timeout);
+                               return (TChannel) (object) new TcpDuplexSessionChannel (this, info, client);
 
                        // FIXME: To implement more.
                        throw new NotImplementedException ();

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TcpDuplexSessionChannel.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TcpDuplexSessionChannel.cs
index 3c6762bf52950927caa3a0a97d16ee50b85b7014..b91ce6cb65954f22b0a3ca88396a0044293a62cb 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TcpDuplexSessionChannel.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TcpDuplexSessionChannel.cs
@@ -68,7 +68,6 @@ namespace System.ServiceModel.Channels
                TcpClient client;
                bool is_service_side;
                EndpointAddress local_address;
-               TimeSpan timeout;
                TcpBinaryFrameManager frame;
                TcpDuplexSession session; // do not use this directly. Use Session instead.
                
@@ -79,13 +78,12 @@ namespace System.ServiceModel.Channels
                        this.info = info;
                }
                
-               public TcpDuplexSessionChannel (ChannelListenerBase listener, TcpChannelInfo info, TcpClient client, TimeSpan timeout)
+               public TcpDuplexSessionChannel (ChannelListenerBase listener, TcpChannelInfo info, TcpClient client)
                        : base (listener)
                {
                        is_service_side = true;
                        this.client = client;
                        this.info = info;
-                       this.timeout = timeout;
                }
                
                public MessageEncoder Encoder {