From: Ben Craig <bencraig@apache.org>
Date: Fri, 11 Oct 2013 13:07:06 +0000 (-0500)
Subject: THRIFT-2226: TServerSocket - keepAlive wrong initialization order
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=49a7663c79ad064fed21bef18e87d929a73a2521;p=common%2Fthrift.git

THRIFT-2226: TServerSocket - keepAlive wrong initialization order
Client: cpp
Patch: Konrad Grochowski
---

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() {