From 49a7663c79ad064fed21bef18e87d929a73a2521 Mon Sep 17 00:00:00 2001 From: Ben Craig Date: Fri, 11 Oct 2013 08:07:06 -0500 Subject: [PATCH] THRIFT-2226: TServerSocket - keepAlive wrong initialization order Client: cpp Patch: Konrad Grochowski --- lib/cpp/src/thrift/transport/TServerSocket.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/cpp/src/thrift/transport/TServerSocket.cpp b/lib/cpp/src/thrift/transport/TServerSocket.cpp index 1c5b9de0..108be27f 100755 --- a/lib/cpp/src/thrift/transport/TServerSocket.cpp +++ b/lib/cpp/src/thrift/transport/TServerSocket.cpp @@ -85,9 +85,9 @@ TServerSocket::TServerSocket(int port) : retryDelay_(0), tcpSendBuffer_(0), tcpRecvBuffer_(0), + keepAlive_(false), intSock1_(THRIFT_INVALID_SOCKET), - intSock2_(THRIFT_INVALID_SOCKET), - keepAlive_(false) + intSock2_(THRIFT_INVALID_SOCKET) {} TServerSocket::TServerSocket(int port, int sendTimeout, int recvTimeout) : @@ -101,9 +101,9 @@ TServerSocket::TServerSocket(int port, int sendTimeout, int recvTimeout) : retryDelay_(0), tcpSendBuffer_(0), tcpRecvBuffer_(0), + keepAlive_(false), intSock1_(THRIFT_INVALID_SOCKET), - intSock2_(THRIFT_INVALID_SOCKET), - keepAlive_(false) + intSock2_(THRIFT_INVALID_SOCKET) {} TServerSocket::TServerSocket(string path) : @@ -118,9 +118,9 @@ TServerSocket::TServerSocket(string path) : retryDelay_(0), tcpSendBuffer_(0), tcpRecvBuffer_(0), + keepAlive_(false), intSock1_(THRIFT_INVALID_SOCKET), - intSock2_(THRIFT_INVALID_SOCKET), - keepAlive_(false) + intSock2_(THRIFT_INVALID_SOCKET) {} TServerSocket::~TServerSocket() { -- 2.17.1