Updated to fix a bug that Purify detected in RSAPrivateKey.cpp (that Marc

    detectged before Purify! ;) ) and to get rid of some commented out
    code.

1 files changed, 1 insertions, 9 deletions

diff --git a/cpp/src/IceSSL/SslConnectionOpenSSL.cpp b/cpp/src/IceSSL/SslConnectionOpenSSL.cpp
index 67d213b742a..f4b56da7cf9 100644
--- a/cpp/src/IceSSL/SslConnectionOpenSSL.cpp
+++ b/cpp/src/IceSSL/SslConnectionOpenSSL.cpp
@@ -307,9 +307,7 @@ int
 IceSSL::OpenSSL::Connection::getLastError() const
 {
     assert(_sslConnection != 0);

-    int retCode = SSL_get_error(_sslConnection, _lastError);

-//    std::cout << "SSL_get_error(): " << std::dec << retCode << std::endl;

-    return retCode;
+    return SSL_get_error(_sslConnection, _lastError);
 }
 
 int
@@ -487,7 +485,6 @@ IceSSL::OpenSSL::Connection::read(Buffer& buf, int timeout)
             {
                 if (!readSelect(timeout))
                 {

-//                    std::cout << "SSL_ERROR_WANT_READ" << std::endl;
                     // Timeout and wait for them to arrive.
                     throw TimeoutException(__FILE__, __LINE__);
                 }
@@ -521,12 +518,10 @@ IceSSL::OpenSSL::Connection::read(Buffer& buf, int timeout)
                     {
                         ConnectionLostException ex(__FILE__, __LINE__);
                         ex.error = getSocketErrno();
-//                        std::cout << std::dec << clock() << " SSL_ERROR_SYSCALL: connectionLost() = " << std::dec << ex.error << std::endl;

                         throw ex;
                     }
                     else
                     {
-//                        std::cout << std::dec << clock() << " SSL_ERROR_SYSCALL" << std::endl;

                         SocketException ex(__FILE__, __LINE__);
                         ex.error = getSocketErrno();
                         throw ex;
@@ -534,7 +529,6 @@ IceSSL::OpenSSL::Connection::read(Buffer& buf, int timeout)
                 }
                 else // (bytesRead == 0)
                 {
-//                    std::cout << std::dec << clock() << " SSL_ERROR_SYSCALL: (bytesRead == 0)" << std::endl;

                     ConnectionLostException ex(__FILE__, __LINE__);
                     ex.error = 0;
                     throw ex;
@@ -557,8 +551,6 @@ IceSSL::OpenSSL::Connection::read(Buffer& buf, int timeout)
                 // But does not necessarily indicate that the underlying transport
                 // has been closed (in the case of Ice, it definitely hasn't yet).
 
-//                std::cout << std::dec << clock() << " SSL_ERROR_ZERO_RETURN" << std::endl;

-//                std::cout << "SslErrors:" << std::endl << sslGetErrors() << std::endl;

                 ConnectionLostException ex(__FILE__, __LINE__);
                 ex.error = getSocketErrno();
                 throw ex;