2 files changed, 5 insertions, 14 deletions
diff --git a/cpp/src/IceSSL/OpenSSLPluginI.cpp b/cpp/src/IceSSL/OpenSSLPluginI.cpp
index d9ed1dde76f..0ab35543ea3 100644
--- a/cpp/src/IceSSL/OpenSSLPluginI.cpp
+++ b/cpp/src/IceSSL/OpenSSLPluginI.cpp
@@ -7,8 +7,6 @@
 //
 // **********************************************************************
 
-#include <IceUtil/Mutex.h>
-
 #include <Ice/LoggerUtil.h>
 #include <Ice/Properties.h>
 #include <Ice/ProtocolPluginFacade.h>
@@ -175,13 +173,6 @@ IceSSL::SslLockKeeper::~SslLockKeeper()
 }
 
 //
-// PluginI implementation
-//
-
-IceUtil::StaticMutex IceSSL::OpenSSLPluginI::_threadIdCacheMutex = ICE_STATIC_MUTEX_INITIALIZER;
-std::vector<unsigned long> IceSSL::OpenSSLPluginI::_threadIdCache;
-
-//
 // Public Methods
 //
 //
@@ -900,7 +891,7 @@ IceSSL::OpenSSLPluginI::registerThread()
 {
     unsigned long threadID = idFunction();
 
-    IceUtil::StaticMutex::Lock sync(_threadIdCacheMutex);
+    IceUtil::Mutex::Lock sync(_threadIdCacheMutex);
 
     if(find(_threadIdCache.begin(), _threadIdCache.end(), threadID) == _threadIdCache.end())
     {
@@ -911,7 +902,7 @@ IceSSL::OpenSSLPluginI::registerThread()
 void
 IceSSL::OpenSSLPluginI::unregisterThreads()
 {
-    IceUtil::StaticMutex::Lock sync(_threadIdCacheMutex);
+    IceUtil::Mutex::Lock sync(_threadIdCacheMutex);
 
     for_each(_threadIdCache.begin(), _threadIdCache.end(), ERR_remove_state);
 }
diff --git a/cpp/src/IceSSL/OpenSSLPluginI.h b/cpp/src/IceSSL/OpenSSLPluginI.h
index 306e4a0d050..77f5b64518b 100644
--- a/cpp/src/IceSSL/OpenSSLPluginI.h
+++ b/cpp/src/IceSSL/OpenSSLPluginI.h
@@ -10,7 +10,7 @@
 #ifndef ICE_SSL_OPENSSL_PLUGIN_I_H
 #define ICE_SSL_OPENSSL_PLUGIN_I_H
 
-#include <IceUtil/StaticMutex.h>
+#include <IceUtil/Mutex.h>
 #include <IceUtil/RecMutex.h>
 
 #include <Ice/LoggerF.h>
@@ -128,8 +128,8 @@ private:
     friend class SslClientTransceiver;
     friend class SslServerTransceiver;
 
-    static IceUtil::StaticMutex _threadIdCacheMutex;
-    static std::vector<unsigned long> _threadIdCache;
+    IceUtil::Mutex _threadIdCacheMutex;
+    std::vector<unsigned long> _threadIdCache;
 
     void registerThread();
     void unregisterThreads();