[thrift] branch master updated: THRIFT-4919 THttpTransport.cs (netstd) and THttpClientTransport (netcore) have bad timeout code Patch: Jens Geyer

[jensg]

This is an automated email from the ASF dual-hosted git repository.

jensg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git


The following commit(s) were added to refs/heads/master by this push:
     new 9cf37be  THRIFT-4919 THttpTransport.cs (netstd) and 
THttpClientTransport (netcore) have bad timeout code Patch: Jens Geyer
9cf37be is described below

commit 9cf37be1f1c86626ddadb277ff6cb17b2fb27da0
Author: Jens Geyer <je...@apache.org>
AuthorDate: Mon Aug 19 23:41:49 2019 +0200

    THRIFT-4919 THttpTransport.cs (netstd) and THttpClientTransport (netcore) 
have bad timeout code
    Patch: Jens Geyer
    
    This closes #1847
---
 lib/netcore/Thrift/Transports/Client/THttpClientTransport.cs | 3 ++-
 lib/netstd/Thrift/Transport/Client/THttpTransport.cs         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/netcore/Thrift/Transports/Client/THttpClientTransport.cs 
b/lib/netcore/Thrift/Transports/Client/THttpClientTransport.cs
index 949bee7..8bce9e4 100644
--- a/lib/netcore/Thrift/Transports/Client/THttpClientTransport.cs
+++ b/lib/netcore/Thrift/Transports/Client/THttpClientTransport.cs
@@ -63,6 +63,7 @@ namespace Thrift.Transports.Client
         public int ConnectTimeout
         {
             set { _connectTimeout = value; }
+            get { return _connectTimeout; }
         }
 
         public override bool IsOpen => true;
@@ -145,7 +146,7 @@ namespace Thrift.Transports.Client
 
             if (_connectTimeout > 0)
             {
-                httpClient.Timeout = TimeSpan.FromSeconds(_connectTimeout);
+                httpClient.Timeout = 
TimeSpan.FromMilliseconds(_connectTimeout);
             }
 
             httpClient.DefaultRequestHeaders.Accept.Add(new 
MediaTypeWithQualityHeaderValue("application/x-thrift"));
diff --git a/lib/netstd/Thrift/Transport/Client/THttpTransport.cs 
b/lib/netstd/Thrift/Transport/Client/THttpTransport.cs
index 21cc409..c84df83 100644
--- a/lib/netstd/Thrift/Transport/Client/THttpTransport.cs
+++ b/lib/netstd/Thrift/Transport/Client/THttpTransport.cs
@@ -145,7 +145,7 @@ namespace Thrift.Transport.Client
 
             if (_connectTimeout > 0)
             {
-                httpClient.Timeout = TimeSpan.FromSeconds(_connectTimeout);
+                httpClient.Timeout = 
TimeSpan.FromMilliseconds(_connectTimeout);
             }
 
             httpClient.DefaultRequestHeaders.Accept.Add(new 
MediaTypeWithQualityHeaderValue("application/x-thrift"));