Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@ -364,8 +364,11 @@ namespace System.ServiceModel.Dispatcher
public void Start ()
{
if (loop_thread == null)
if (loop_thread == null) {
loop_thread = new Thread (new ThreadStart (Loop));
loop_thread.IsBackground = true;
}
loop_thread.Start ();
}
@ -425,8 +428,10 @@ namespace System.ServiceModel.Dispatcher
Logger.Warning (String.Format ("Channel listener '{0}' is not closed. Aborting.", owner.Listener.GetType ()));
owner.Listener.Abort ();
}
if (loop_thread != null && loop_thread.IsAlive)
loop_thread.Abort ();
if (loop_thread != null && loop_thread.IsAlive) {
if (!loop_thread.Join (500))
loop_thread.Abort ();
}
loop_thread = null;
}