[thrift] branch master updated: THRIFT-4821 Normalized the constructors in TServerSocketTransport to allow parity between the TcpListerer and port options. Client: netstd Patch: Kyle Smith

[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 cf51a84  THRIFT-4821 Normalized the constructors in 
TServerSocketTransport to allow parity between the TcpListerer and port 
options. Client: netstd Patch: Kyle Smith
cf51a84 is described below

commit cf51a843911e7d8fefe1018cfce3560a593cd808
Author: Kyle Smith <ksm...@jrautomation.com>
AuthorDate: Thu Mar 14 06:59:49 2019 -0400

    THRIFT-4821 Normalized the constructors in TServerSocketTransport to allow 
parity between the TcpListerer and port options.
    Client: netstd
    Patch: Kyle Smith
    
    This closes #1758
---
 .../Transport/Server/TServerSocketTransport.cs     | 32 ++++------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/lib/netstd/Thrift/Transport/Server/TServerSocketTransport.cs 
b/lib/netstd/Thrift/Transport/Server/TServerSocketTransport.cs
index 710dedf..bc06640 100644
--- a/lib/netstd/Thrift/Transport/Server/TServerSocketTransport.cs
+++ b/lib/netstd/Thrift/Transport/Server/TServerSocketTransport.cs
@@ -28,47 +28,27 @@ namespace Thrift.Transport.Server
     public class TServerSocketTransport : TServerTransport
     {
         private readonly int _clientTimeout;
-        private readonly int _port;
         private readonly bool _useBufferedSockets;
         private readonly bool _useFramedTransport;
         private TcpListener _server;
 
-        public TServerSocketTransport(TcpListener listener)
-            : this(listener, 0)
-        {
-        }
-
-        public TServerSocketTransport(TcpListener listener, int clientTimeout)
+        public TServerSocketTransport(TcpListener listener, int clientTimeout 
= 0, bool useBufferedSockets = false, bool useFramedTransport = false)
         {
             _server = listener;
             _clientTimeout = clientTimeout;
+            _useBufferedSockets = useBufferedSockets;
+            _useFramedTransport = useFramedTransport;
         }
 
-        public TServerSocketTransport(int port)
-            : this(port, 0)
-        {
-        }
-
-        public TServerSocketTransport(int port, int clientTimeout)
-            : this(port, clientTimeout, false)
-        {
-        }
-
-        public TServerSocketTransport(int port, int clientTimeout, bool 
useBufferedSockets):
-            this(port, clientTimeout, useBufferedSockets, false)
-        {
-        }
-        
-        public TServerSocketTransport(int port, int clientTimeout, bool 
useBufferedSockets, bool useFramedTransport)
+        public TServerSocketTransport(int port, int clientTimeout = 0, bool 
useBufferedSockets = false, bool useFramedTransport = false)
         {
-            _port = port;
             _clientTimeout = clientTimeout;
             _useBufferedSockets = useBufferedSockets;
             _useFramedTransport = useFramedTransport;
             try
             {
                 // Make server socket
-                _server = new TcpListener(IPAddress.Any, _port);
+                _server = new TcpListener(IPAddress.Any, port);
                 _server.Server.NoDelay = true;
             }
             catch (Exception)
@@ -171,4 +151,4 @@ namespace Thrift.Transport.Server
             }
         }
     }
-}
\ No newline at end of file
+}