[System.ServiceModel] Don't use DateTime.Now for measuring elapsed time

[mono.git] / mcs / class / System.ServiceModel / System.ServiceModel.Dispatcher / ChannelDispatcher.cs

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChannelDispatcher.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChannelDispatcher.cs
index 65b5c8cf38ae6913b2482b54609ecc8ee45064e4..96295321715d7f2da3156eb9bb3bd2d334f49866 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChannelDispatcher.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChannelDispatcher.cs
@@ -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 ();
                        }
 
@@ -411,7 +414,7 @@ namespace System.ServiceModel.Dispatcher
                                if (loop_thread == null)
                                        return;
 
-                               close_started = DateTime.Now;
+                               close_started = DateTime.UtcNow;
                                close_timeout = timeout;
                                loop = false;
                                creator_handle.Set ();
@@ -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;
                        }
 
@@ -462,7 +467,7 @@ namespace System.ServiceModel.Dispatcher
                                        }
                                        else {
                                                try {
-                                                       ch.Close (close_timeout - (DateTime.Now - close_started));
+                                                       ch.Close (close_timeout - (DateTime.UtcNow - close_started));
                                                } catch (Exception ex) {
                                                        // FIXME: log it.
                                                        Logger.Error (String.Format ("Exception on closing channel ({0})", ch.GetType ()), ex);