Repository: thrift Updated Branches: refs/heads/master 9dfe7b83e -> 9f85468eb
THRIFT-1642 pull in patch from Jira to fix signedness issue in timeout calculation This closes #485 Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/9f85468e Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/9f85468e Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/9f85468e Branch: refs/heads/master Commit: 9f85468eb6acab173dd45a5e8d2c8a87e77923a7 Parents: 9dfe7b8 Author: Jim King <[email protected]> Authored: Sun May 10 06:59:17 2015 -0400 Committer: Roger Meier <[email protected]> Committed: Sun May 10 14:42:42 2015 +0200 ---------------------------------------------------------------------- lib/cpp/src/thrift/transport/TSocket.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/9f85468e/lib/cpp/src/thrift/transport/TSocket.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TSocket.cpp b/lib/cpp/src/thrift/transport/TSocket.cpp index cc4dce0..4156d7e 100644 --- a/lib/cpp/src/thrift/transport/TSocket.cpp +++ b/lib/cpp/src/thrift/transport/TSocket.cpp @@ -564,7 +564,7 @@ try_again: THRIFT_GETTIMEOFDAY(&end, NULL); uint32_t readElapsedMicros = static_cast<uint32_t>(((end.tv_sec - begin.tv_sec) * 1000 * 1000) - + (((uint64_t)(end.tv_usec - begin.tv_usec)))); + + (end.tv_usec - begin.tv_usec)); if (!eagainThresholdMicros || (readElapsedMicros < eagainThresholdMicros)) { if (retries++ < maxRecvRetries_) {
