Updated Communicator.ice so that SSL related methods are only included when

    compiling the slice with -DICE_CPP. Updated project and Makefile
    accordingly. Continuing cleanup.

1 files changed, 5 insertions, 1 deletions

diff --git a/cpp/src/Ice/SslConnectionOpenSSLServer.cpp b/cpp/src/Ice/SslConnectionOpenSSLServer.cpp
index 1dcea25d049..96392f0e551 100644
--- a/cpp/src/Ice/SslConnectionOpenSSLServer.cpp
+++ b/cpp/src/Ice/SslConnectionOpenSSLServer.cpp
@@ -54,7 +54,9 @@ IceSSL::OpenSSL::ServerConnection::ServerConnection(
             SSL* connection,

             const IceSSL::SystemInternalPtr& system) :
                                             Connection(traceLevels, logger, certificateVerifier, connection, system)
-{
+{

+    assert(_sslConnection != 0);
+

     // Set the Accept Connection state for this connection.

     SSL_set_accept_state(_sslConnection);

 }
@@ -72,6 +74,8 @@ IceSSL::OpenSSL::ServerConnection::shutdown()
 int
 IceSSL::OpenSSL::ServerConnection::init(int timeout)
 {

+    assert(_sslConnection != 0);

+

     int retCode = SSL_is_init_finished(_sslConnection);
     
     while (!retCode)