commit 49a7663c79ad064fed21bef18e87d929a73a2521
author Ben Craig <bencraig@apache.org> Fri Oct 11 08:07:06 2013 -0500
committer Ben Craig <bencraig@apache.org> Fri Oct 11 08:07:06 2013 -0500
tree 8f21b32f8269a52918841ad35a94b29afd7ee9bc
parent 71b5a10b613406765037ecd0e300769b34741c00

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

lib/cpp/src/thrift/transport/TServerSocket.cpp

diff --git a/lib/cpp/src/thrift/transport/TServerSocket.cpp b/lib/cpp/src/thrift/transport/TServerSocket.cpp
index 1c5b9de..108be27 100755
--- a/lib/cpp/src/thrift/transport/TServerSocket.cpp
+++ b/lib/cpp/src/thrift/transport/TServerSocket.cpp
@@ -85,9 +85,9 @@
   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 @@
   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 @@
   retryDelay_(0),
   tcpSendBuffer_(0),
   tcpRecvBuffer_(0),
+  keepAlive_(false),
   intSock1_(THRIFT_INVALID_SOCKET),
-  intSock2_(THRIFT_INVALID_SOCKET),
-  keepAlive_(false)
+  intSock2_(THRIFT_INVALID_SOCKET)
 {}
 
 TServerSocket::~TServerSocket() {