Fixed SSL_ZERO_RETURN handling in read() and write() methods.

1 files changed, 3 insertions, 16 deletions

diff --git a/cpp/src/Ice/SslConnectionOpenSSL.cpp b/cpp/src/Ice/SslConnectionOpenSSL.cpp
index 8e55d10742f..a8f937710b7 100644
--- a/cpp/src/Ice/SslConnectionOpenSSL.cpp
+++ b/cpp/src/Ice/SslConnectionOpenSSL.cpp
@@ -540,22 +540,9 @@ IceSecurity::Ssl::OpenSSL::Connection::readSSL(Buffer& buf, int timeout)
 
                 case SSL_ERROR_ZERO_RETURN:
                 {
-                    // string errorString = "SSL_ERROR_ZERO_RETURN";
-                    // ICE_EXCEPTION(errorString);
-                    // throw ShutdownException(errorString.c_str(), __FILE__, __LINE__);
-
-                    if (connectionLost())
-	            {
-		        ConnectionLostException ex(__FILE__, __LINE__);
-		        ex.error = getSocketErrno();
-		        throw ex;
-	            }
-	            else
-	            {
-		        SocketException ex(__FILE__, __LINE__);
-		        ex.error = getSocketErrno();
-		        throw ex;
-	            }
+		    ConnectionLostException ex(__FILE__, __LINE__);
+		    ex.error = getSocketErrno();
+		    throw ex;
                 }
             }
         }