Merge pull request #5198 from BrzVlad/fix-binprot-stats

[mono.git] / mcs / class / System.ServiceModel / System.ServiceModel / DuplexClientRuntimeChannel.cs

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/DuplexClientRuntimeChannel.cs b/mcs/class/System.ServiceModel/System.ServiceModel/DuplexClientRuntimeChannel.cs
index 4fa56e12a78a964bba565818d308429d40ba09e6..08e6a6e38bae049056f0299c43bf761a007f89cc 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/DuplexClientRuntimeChannel.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/DuplexClientRuntimeChannel.cs
@@ -115,12 +115,12 @@ namespace System.ServiceModel.MonoInternal
 
                protected override void OnClose (TimeSpan timeout)
                {
-                       DateTime start = DateTime.Now;
+                       DateTime start = DateTime.UtcNow;
                        base.OnClose (timeout);
                        loop = false;
-                       if (!loop_handle.WaitOne (timeout - (DateTime.Now - start)))
+                       if (!loop_handle.WaitOne (timeout - (DateTime.UtcNow - start)))
                                throw new TimeoutException ();
-                       if (!finish_handle.WaitOne (timeout - (DateTime.Now - start)))
+                       if (!finish_handle.WaitOne (timeout - (DateTime.UtcNow - start)))
                                throw new TimeoutException ();
                }
 
@@ -192,10 +192,6 @@ namespace System.ServiceModel.MonoInternal
                        } catch (Exception ex) {
                                // FIXME: log it.
                                Console.WriteLine (ex);
-                       } finally {
-                               // unless it is closed by session/call manager, move it back to the loop to receive the next message.
-                               if (loop && input.State != CommunicationState.Closed)
-                                       ProcessRequestOrInput (input);
                        }
                }
 
@@ -208,7 +204,7 @@ namespace System.ServiceModel.MonoInternal
                
                internal override Message RequestCorrelated (Message msg, TimeSpan timeout, IOutputChannel channel)
                {
-                       DateTime startTime = DateTime.Now;
+                       DateTime startTime = DateTime.UtcNow;
                        Message ret = null;
                        ManualResetEvent wait = new ManualResetEvent (false);
                        Action<Message> handler = delegate (Message reply) {
@@ -217,7 +213,7 @@ namespace System.ServiceModel.MonoInternal
                        };
                        ReplyHandlerQueue.Enqueue (handler);
                        channel.Send (msg, timeout);
-                       if (ret == null && !wait.WaitOne (timeout - (DateTime.Now - startTime)))
+                       if (ret == null && !wait.WaitOne (timeout - (DateTime.UtcNow - startTime)))
                                throw new TimeoutException ();
                        return ret;
                }