bug 1156: removing deprecated Identity properties

1 files changed, 2 insertions, 15 deletions

diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp
index 7c604c1a392..76030e75f64 100644
--- a/cpp/src/IcePatch2/Server.cpp
+++ b/cpp/src/IcePatch2/Server.cpp
@@ -159,24 +159,12 @@ IcePatch2::PatcherService::start(int argc, char* argv[])
     const string instanceNameProperty = "IcePatch2.InstanceName";
     string instanceName = properties->getPropertyWithDefault(instanceNameProperty, "IcePatch2");
 
-    const string idProperty = "IcePatch2.Identity";
-    string idStr = properties->getProperty(idProperty);
-    if(idStr.empty())
-    {
-	idStr = instanceName + "/server";
-    }
-    Identity id = communicator()->stringToIdentity(idStr);
+    Identity id = communicator()->stringToIdentity(instanceName + "/server");
     adapter->add(new FileServerI(dataDir, infoSeq), id);
 
     if(adminAdapter)
     {
-	const string adminIdProperty = "IcePatch2.AdminIdentity";
-	string adminIdStr = properties->getProperty(adminIdProperty);
-	if(adminIdStr.empty())
-	{
-	    adminIdStr = instanceName + "/admin";
-	}
-	Identity adminId = communicator()->stringToIdentity(adminIdStr);
+	Identity adminId = communicator()->stringToIdentity(instanceName + "/admin");
 	adminAdapter->add(new AdminI(communicator()), adminId);
     }
 
@@ -195,7 +183,6 @@ IcePatch2::PatcherService::stop()
     return true;
 }
 
-
 void
 IcePatch2::PatcherService::usage(const string& appName)
 {