2009-06-12 Atsushi Enomoto <atsushi@ximian.com>

	* CustomBinding.cs : copy timeouts from argument binding in copy ctr.

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
index cde7d9f8df0dd695a9ee3a0a4a12444a6819320a..830f1d7557c3a8dfeae78f1146582d846745e95b 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-06-12  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * CustomBinding.cs : copy timeouts from argument binding in copy ctr.
+
 2009-06-11  Atsushi Enomoto  <atsushi@ximian.com>
 
        * HttpReplyChannel.cs : reject multiple WaitForRequest calls.

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/CustomBinding.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/CustomBinding.cs
index 273bffb765ebad8ddb5f1e81b0415e3ee4d82c24..e539aecdd989d782b500cc5ce54c904704eebe26 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/CustomBinding.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/CustomBinding.cs
@@ -62,6 +62,10 @@ namespace System.ServiceModel.Channels
                                binding.Name, binding.Namespace)
                {
                        this.binding = binding;
+                       OpenTimeout = binding.OpenTimeout;
+                       CloseTimeout = binding.CloseTimeout;
+                       SendTimeout = binding.SendTimeout;
+                       ReceiveTimeout = binding.ReceiveTimeout;
                        scheme = binding.Scheme;
                        security = binding as ISecurityCapabilities;
                }