Renamed all the Ssl* files. Modified the config/TestUtil.py file to include

    a clientServerHybridTest - handles the test case that client and server
    are BOTH client and server roles.

1 files changed, 9 insertions, 9 deletions

diff --git a/cpp/src/Ice/SslFactory.cpp b/cpp/src/Ice/SslFactory.cpp
index bdde9bfa6a4..253a913d320 100644
--- a/cpp/src/Ice/SslFactory.cpp
+++ b/cpp/src/Ice/SslFactory.cpp
@@ -16,10 +16,10 @@
 #ifdef WIN32
 #pragma warning(disable:4786)
 #endif
-

-#include <Ice/Instance.h>

+
+#include <Ice/Instance.h>
 #include <Ice/SslFactory.h>
-#include <Ice/SslSystemOpenSSL.h>
+#include <Ice/SystemOpenSSL.h>
 #include <Ice/OpenSSL.h>
 
 #define OPENSSL_THREAD_DEFINES
@@ -80,17 +80,17 @@ IceSSL::SystemInternalPtr
 IceSSL::Factory::getSystem(const IceInternal::InstancePtr& instance)
 {
     SystemInternalPtr system = new OpenSSL::System(instance);
-

+
     assert(system != 0);
-

+
     return system;
 }
 
 void
 IceSSL::Factory::addSystemHandle(void* sslHandle, const SystemInternalPtr& system)
 {
-    IceUtil::Mutex::Lock sync(_systemRepositoryMutex);

-

+    IceUtil::Mutex::Lock sync(_systemRepositoryMutex);
+
     assert(system != 0);
     assert(sslHandle != 0);
     _sslHandleSystemRepository[sslHandle] = system;
@@ -99,8 +99,8 @@ IceSSL::Factory::addSystemHandle(void* sslHandle, const SystemInternalPtr& syste
 void
 IceSSL::Factory::removeSystemHandle(void* sslHandle)
 {
-    IceUtil::Mutex::Lock sync(_systemRepositoryMutex);

-

+    IceUtil::Mutex::Lock sync(_systemRepositoryMutex);
+
     assert(sslHandle != 0);
     _sslHandleSystemRepository.erase(sslHandle);
 }