1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/test/IceSSL/configuration/TestI.cpp b/cpp/test/IceSSL/configuration/TestI.cpp
index b467dc264ee..dec6aea05e3 100644
--- a/cpp/test/IceSSL/configuration/TestI.cpp
+++ b/cpp/test/IceSSL/configuration/TestI.cpp
@@ -83,10 +83,13 @@ ServerI::checkCipher(ICE_IN(string) cipher, const Ice::Current& c)
 void
 ServerI::destroy()
 {
-    string defaultDir = _communicator->getProperties()->getProperty("IceSSL.DefaultDir");
     _communicator->destroy();
 }
 
+ServerFactoryI::ServerFactoryI(const string& defaultDir) : _defaultDir(defaultDir)
+{
+}
+
 Test::ServerPrxPtr
 ServerFactoryI::createServer(ICE_IN(Test::Properties) props, const Current&)
 {
@@ -96,6 +99,7 @@ ServerFactoryI::createServer(ICE_IN(Test::Properties) props, const Current&)
     {
         initData.properties->setProperty(p->first, p->second);
     }
+    initData.properties->setProperty("IceSSL.DefaultDir", _defaultDir);
 
     CommunicatorPtr communicator = initialize(initData);
     ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("ServerAdapter", "ssl");