commit bcd8e3268e6296813a9658cf7da4785e519088f7
author Nobuaki Sukegawa <nsuke@apache.org> Sun Jan 24 00:27:08 2016 +0900
committer Nobuaki Sukegawa <nsuke@apache.org> Mon Feb 01 21:24:34 2016 +0900
tree 86e5d5558194a6c9b9f2de6aced9ef671a0563a3
parent 2eed686406812411199f30e64131548000bbb62a

THRIFT-3420 C++: TSSLSockets are not interruptable

Fix typo that prevented retrying on EAGAIN etc.

This closes #815

lib/cpp/src/thrift/transport/TSSLSocket.cpp

diff --git a/lib/cpp/src/thrift/transport/TSSLSocket.cpp b/lib/cpp/src/thrift/transport/TSSLSocket.cpp
index 8e56426..c5bb1f6 100644
--- a/lib/cpp/src/thrift/transport/TSSLSocket.cpp
+++ b/lib/cpp/src/thrift/transport/TSSLSocket.cpp
@@ -257,7 +257,7 @@
       switch (error) {
         case SSL_ERROR_SYSCALL:
           if ((errno_copy != THRIFT_EINTR)
-              || (errno_copy != THRIFT_EAGAIN)) {
+              && (errno_copy != THRIFT_EAGAIN)) {
             break;
           }
         case SSL_ERROR_WANT_READ:
@@ -296,7 +296,7 @@
         switch (error) {
           case SSL_ERROR_SYSCALL:
             if ((errno_copy != THRIFT_EINTR)
-                || (errno_copy != THRIFT_EAGAIN)) {
+                && (errno_copy != THRIFT_EAGAIN)) {
               break;
             }
           case SSL_ERROR_WANT_READ:
@@ -334,7 +334,7 @@
     switch (error) {
       case SSL_ERROR_SYSCALL:
         if ((errno_copy != THRIFT_EINTR)
-            || (errno_copy != THRIFT_EAGAIN)) {
+            && (errno_copy != THRIFT_EAGAIN)) {
               break;
         }
         if (retries++ >= maxRecvRetries_) {
@@ -376,7 +376,7 @@
       switch (error) {
         case SSL_ERROR_SYSCALL:
           if ((errno_copy != THRIFT_EINTR)
-              || (errno_copy != THRIFT_EAGAIN)) {
+              && (errno_copy != THRIFT_EAGAIN)) {
             break;
           }
         case SSL_ERROR_WANT_READ:
@@ -457,7 +457,7 @@
         switch (error) {
           case SSL_ERROR_SYSCALL:
             if ((errno_copy != THRIFT_EINTR)
-                || (errno_copy != THRIFT_EAGAIN)) {
+                && (errno_copy != THRIFT_EAGAIN)) {
               break;
             }
           case SSL_ERROR_WANT_READ:
@@ -477,7 +477,7 @@
         switch (error) {
           case SSL_ERROR_SYSCALL:
             if ((errno_copy != THRIFT_EINTR)
-                || (errno_copy != THRIFT_EAGAIN)) {
+                && (errno_copy != THRIFT_EAGAIN)) {
               break;
             }
           case SSL_ERROR_WANT_READ: