diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2010-01-20 08:26:38 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2010-01-20 08:26:38 +0300 |
| commit | 8ed821727378f2b425d29a8e38f20da7a935f9f3 (patch) | |
| tree | af821f45c07f5ff01e505637b4d50dd979103443 /mcs | |
| parent | 5135630b6d61627fe437c52150cf3138f34d3b18 (diff) | |
2010-01-20 Atsushi Enomoto <atsushi@ximian.com>
* ServiceHostBase.cs : a stability workaround to make nunit test
stopper almost reproducible.
svn path=/trunk/mcs/; revision=149876
Diffstat (limited to 'mcs')
| -rwxr-xr-x | mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog index 7a3fbf34794..bf940134630 100755 --- a/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog +++ b/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog @@ -1,3 +1,8 @@ +2010-01-20 Atsushi Enomoto <atsushi@ximian.com> + + * ServiceHostBase.cs : a stability workaround to make nunit test + stopper almost reproducible. + 2010-01-19 Atsushi Enomoto <atsushi@ximian.com> * WS2007FederationHttpBinding.cs, WS2007HttpBinding.cs: diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs index 73f8c3ad5e8..fe1ac72895f 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs @@ -442,10 +442,6 @@ namespace System.ServiceModel ServicesSection services = ConfigUtil.ServicesSection; } - void DoOpen (TimeSpan timeout) - { - } - [MonoTODO] protected override sealed void OnAbort () { @@ -495,6 +491,9 @@ namespace System.ServiceModel InitializeRuntime (); foreach (var cd in ChannelDispatchers) cd.Open (timeout - (DateTime.Now - start)); + + // FIXME: remove this hack. It should make sure that each ChannelDispatcher's loop has started, using WaitHandle.WaitAll() or something similar. + System.Threading.Thread.Sleep (300); } protected override void OnEndClose (IAsyncResult result) |