1 files changed, 16 insertions, 11 deletions

diff --git a/csharp/test/IceSSL/configuration/TestI.cs b/csharp/test/IceSSL/configuration/TestI.cs
index c1858b6601b..f05b8198741 100644
--- a/csharp/test/IceSSL/configuration/TestI.cs
+++ b/csharp/test/IceSSL/configuration/TestI.cs
@@ -16,7 +16,7 @@ internal sealed class ServerI : ServerDisp_
 {
     internal ServerI(Ice.Communicator communicator)
     {
-        communicator_ = communicator;
+        _communicator = communicator;
     }
 
     public override void
@@ -66,7 +66,7 @@ internal sealed class ServerI : ServerDisp_
 
     internal void destroy()
     {
-        communicator_.destroy();
+        _communicator.destroy();
     }
 
     private static void test(bool b)
@@ -77,7 +77,7 @@ internal sealed class ServerI : ServerDisp_
         }
     }
 
-    private Ice.Communicator communicator_;
+    private Ice.Communicator _communicator;
 }
 
 internal sealed class ServerFactoryI : ServerFactoryDisp_
@@ -90,6 +90,11 @@ internal sealed class ServerFactoryI : ServerFactoryDisp_
         }
     }
 
+    public ServerFactoryI(string defaultDir)
+    {
+        _defaultDir = defaultDir;
+    }
+
     public override ServerPrx createServer(Dictionary<string, string> props, Ice.Current current)
     {
         Ice.InitializationData initData = new Ice.InitializationData();
@@ -98,34 +103,34 @@ internal sealed class ServerFactoryI : ServerFactoryDisp_
         {
             initData.properties.setProperty(key, props[key]);
         }
-
+        initData.properties.setProperty("IceSSL.DefaultDir", _defaultDir);
         string[] args = new string[0];
         Ice.Communicator communicator = Ice.Util.initialize(ref args, initData);
         Ice.ObjectAdapter adapter = communicator.createObjectAdapterWithEndpoints("ServerAdapter", "ssl");
         ServerI server = new ServerI(communicator);
         Ice.ObjectPrx obj = adapter.addWithUUID(server);
-        servers_[obj.ice_getIdentity()] = server;
+        _servers[obj.ice_getIdentity()] = server;
         adapter.activate();
-
         return ServerPrxHelper.uncheckedCast(obj);
     }
 
     public override void destroyServer(ServerPrx srv, Ice.Current current)
     {
         Ice.Identity key = srv.ice_getIdentity();
-        if(servers_.Contains(key))
+        if(_servers.Contains(key))
         {
-            ServerI server = servers_[key] as ServerI;
+            ServerI server = _servers[key] as ServerI;
             server.destroy();
-            servers_.Remove(key);
+            _servers.Remove(key);
         }
     }
 
     public override void shutdown(Ice.Current current)
     {
-        test(servers_.Count == 0);
+        test(_servers.Count == 0);
         current.adapter.getCommunicator().shutdown();
     }
 
-    private Hashtable servers_ = new Hashtable();
+    private string _defaultDir;
+    private Hashtable _servers = new Hashtable();
 }