2009-04-27 Atsushi Enomoto <atsushi@ximian.com>

	* ChannelManagerBase.cs : implement Open/CloseTimeout correctly.

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
index 7c4233235a02ce1fe0a1b1dc961c165c1cc09263..1459d408fe6d7a384b44819c68a9bc3c82f5e3c0 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-27  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * ChannelManagerBase.cs : implement Open/CloseTimeout correctly.
+
 2009-04-23  Atsushi Enomoto  <atsushi@ximian.com>
 
        * BinaryMessageEncoder.cs : use quotas in binding element.

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelManagerBase.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelManagerBase.cs
index 9ec77da87f9a072c3466f05aee030c8159039aaa..8676cd86811f3eaa92bc69c6814176531e35fd72 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelManagerBase.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelManagerBase.cs
@@ -44,18 +44,12 @@ namespace System.ServiceModel.Channels
 
                protected internal abstract TimeSpan DefaultSendTimeout { get; }
 
-               // The reason why this class implements 
-               // IDefaultCommunicationTimeouts is not clear, so they
-               // are likely to be refactored.
-
-               [MonoTODO ("verify it.")]
                TimeSpan IDefaultCommunicationTimeouts.OpenTimeout {
-                       get { return TimeSpan.FromMinutes (1); }
+                       get { return DefaultOpenTimeout; }
                }
 
-               [MonoTODO ("verify it.")]
                TimeSpan IDefaultCommunicationTimeouts.CloseTimeout {
-                       get { return TimeSpan.FromMinutes (1); }
+                       get { return DefaultCloseTimeout; }
                }
 
                TimeSpan IDefaultCommunicationTimeouts.ReceiveTimeout {