You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by be...@apache.org on 2013/10/11 15:08:59 UTC
git commit: THRIFT-2226: TServerSocket - keepAlive wrong
initialization order Client: cpp Patch: Konrad Grochowski
Updated Branches:
refs/heads/master 71b5a10b6 -> 49a7663c7
THRIFT-2226: TServerSocket - keepAlive wrong initialization order
Client: cpp
Patch: Konrad Grochowski
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/49a7663c
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/49a7663c
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/49a7663c
Branch: refs/heads/master
Commit: 49a7663c79ad064fed21bef18e87d929a73a2521
Parents: 71b5a10
Author: Ben Craig <be...@apache.org>
Authored: Fri Oct 11 08:07:06 2013 -0500
Committer: Ben Craig <be...@apache.org>
Committed: Fri Oct 11 08:07:06 2013 -0500
----------------------------------------------------------------------
lib/cpp/src/thrift/transport/TServerSocket.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/49a7663c/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 @@ 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() {