1 files changed, 399 insertions, 399 deletions

diff --git a/cpp/test/IceGrid/replicaGroup/AllTests.cpp b/cpp/test/IceGrid/replicaGroup/AllTests.cpp
index 9ae9ce21c3c..d07d69a1c17 100644
--- a/cpp/test/IceGrid/replicaGroup/AllTests.cpp
+++ b/cpp/test/IceGrid/replicaGroup/AllTests.cpp
@@ -27,7 +27,7 @@ class SessionKeepAliveThread : public IceUtil::Thread, public IceUtil::Monitor<I
 public:
 
     SessionKeepAliveThread(const IceGrid::AdminSessionPrx& session, long timeout) :
-	_session(session),
+        _session(session),
         _timeout(IceUtil::Time::seconds(timeout)),
         _destroy(false)
     {
@@ -42,15 +42,15 @@ public:
             timedWait(_timeout);
             if(_destroy)
             {
-	        break;
-	    }
+                break;
+            }
             try
             {
                 _session->keepAlive();
             }
             catch(const Ice::Exception&)
             {
-		break;
+                break;
             }
         }
     }
@@ -86,12 +86,12 @@ instantiateServer(const AdminPrx& admin, const string& templ, const string& node
     update.nodes.push_back(nodeUpdate);
     try
     {
-	admin->updateApplication(update);
+        admin->updateApplication(update);
     }
     catch(DeploymentException& ex)
     {
-	cerr << ex.reason << endl;
-	test(false);
+        cerr << ex.reason << endl;
+        test(false);
     }
 }
 
@@ -100,7 +100,7 @@ removeServer(const AdminPrx& admin, const string& id)
 {
     try
     {
-	admin->stopServer(id);
+        admin->stopServer(id);
     }
     catch(const ServerStopException&)
     {
@@ -110,8 +110,8 @@ removeServer(const AdminPrx& admin, const string& id)
     }
     catch(const Ice::UserException& ex)
     {
-	cerr << ex << endl;
-	test(false);
+        cerr << ex << endl;
+        test(false);
     }
 
     NodeUpdateDescriptor nodeUpdate;
@@ -122,12 +122,12 @@ removeServer(const AdminPrx& admin, const string& id)
     update.nodes.push_back(nodeUpdate);
     try
     {
-	admin->updateApplication(update);
+        admin->updateApplication(update);
     }
     catch(DeploymentException& ex)
     {
-	cerr << ex.reason << endl;
-	test(false);
+        cerr << ex.reason << endl;
+        test(false);
     }
 }
 
@@ -155,434 +155,434 @@ allTests(const Ice::CommunicatorPtr& comm)
 
     cout << "testing Query::findAllReplicas... " << flush;
     {
-	map<string, string> params;
-	params["replicaGroup"] = "RoundRobin";
-	params["id"] = "Server1";
-	instantiateServer(admin, "Server", "localnode", params);
-	params["id"] = "Server2";
-	instantiateServer(admin, "Server", "localnode", params);
-	params["id"] = "Server3";
-	instantiateServer(admin, "Server", "localnode", params);
-
-	QueryPrx query = IceGrid::QueryPrx::checkedCast(comm->stringToProxy("IceGrid/Query"));
-	test(query);
-	
-	TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("dummy@RoundRobin"));
-	Ice::ObjectProxySeq objs = query->findAllReplicas(obj);
-	test(objs.size() == 3);
-	test(serverReplicaIds.find(objs[0]->ice_getAdapterId()) != serverReplicaIds.end());
-	test(serverReplicaIds.find(objs[1]->ice_getAdapterId()) != serverReplicaIds.end());
-	test(serverReplicaIds.find(objs[2]->ice_getAdapterId()) != serverReplicaIds.end());
-	
-	obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("dummy@dummy"));
-	objs = query->findAllReplicas(obj);
-	test(objs.empty());
-
-	obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("dummy@Server1.ReplicatedAdapter"));
-	objs = query->findAllReplicas(obj);
-	test(objs.empty());
-
-	obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("dummy:tcp"));
-	objs = query->findAllReplicas(obj);
-	test(objs.empty());
-	
-	removeServer(admin, "Server1");
-	removeServer(admin, "Server2");
-	removeServer(admin, "Server3");
+        map<string, string> params;
+        params["replicaGroup"] = "RoundRobin";
+        params["id"] = "Server1";
+        instantiateServer(admin, "Server", "localnode", params);
+        params["id"] = "Server2";
+        instantiateServer(admin, "Server", "localnode", params);
+        params["id"] = "Server3";
+        instantiateServer(admin, "Server", "localnode", params);
+
+        QueryPrx query = IceGrid::QueryPrx::checkedCast(comm->stringToProxy("IceGrid/Query"));
+        test(query);
+        
+        TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("dummy@RoundRobin"));
+        Ice::ObjectProxySeq objs = query->findAllReplicas(obj);
+        test(objs.size() == 3);
+        test(serverReplicaIds.find(objs[0]->ice_getAdapterId()) != serverReplicaIds.end());
+        test(serverReplicaIds.find(objs[1]->ice_getAdapterId()) != serverReplicaIds.end());
+        test(serverReplicaIds.find(objs[2]->ice_getAdapterId()) != serverReplicaIds.end());
+        
+        obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("dummy@dummy"));
+        objs = query->findAllReplicas(obj);
+        test(objs.empty());
+
+        obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("dummy@Server1.ReplicatedAdapter"));
+        objs = query->findAllReplicas(obj);
+        test(objs.empty());
+
+        obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("dummy:tcp"));
+        objs = query->findAllReplicas(obj);
+        test(objs.empty());
+        
+        removeServer(admin, "Server1");
+        removeServer(admin, "Server2");
+        removeServer(admin, "Server3");
     }
     cout << "ok" << endl;
 
     cout << "testing replication with round-robin load balancing... " << flush;
     {
-	map<string, string> params;
-	params["replicaGroup"] = "RoundRobin";
-	params["id"] = "Server1";
-	instantiateServer(admin, "Server", "localnode", params);
-	params["id"] = "Server2";
-	instantiateServer(admin, "Server", "localnode", params);
-	params["id"] = "Server3";
-	instantiateServer(admin, "Server", "localnode", params);
-	TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("RoundRobin"));
-	try
-	{
-	    test(obj->getReplicaIdAndShutdown() == "Server1.ReplicatedAdapter");
-	    test(obj->getReplicaIdAndShutdown() == "Server2.ReplicatedAdapter");
-	    test(obj->getReplicaIdAndShutdown() == "Server3.ReplicatedAdapter");	
-	}
-	catch(const Ice::LocalException& ex)
-	{
-	    cerr << ex << endl;
-	    test(false);
-	}
-	removeServer(admin, "Server1");
-	removeServer(admin, "Server2");
-	removeServer(admin, "Server3");
+        map<string, string> params;
+        params["replicaGroup"] = "RoundRobin";
+        params["id"] = "Server1";
+        instantiateServer(admin, "Server", "localnode", params);
+        params["id"] = "Server2";
+        instantiateServer(admin, "Server", "localnode", params);
+        params["id"] = "Server3";
+        instantiateServer(admin, "Server", "localnode", params);
+        TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("RoundRobin"));
+        try
+        {
+            test(obj->getReplicaIdAndShutdown() == "Server1.ReplicatedAdapter");
+            test(obj->getReplicaIdAndShutdown() == "Server2.ReplicatedAdapter");
+            test(obj->getReplicaIdAndShutdown() == "Server3.ReplicatedAdapter");        
+        }
+        catch(const Ice::LocalException& ex)
+        {
+            cerr << ex << endl;
+            test(false);
+        }
+        removeServer(admin, "Server1");
+        removeServer(admin, "Server2");
+        removeServer(admin, "Server3");
     }
     {
-	map<string, string> params;
-	params["replicaGroup"] = "RoundRobin";
-	params["id"] = "IceBox1";
-	instantiateServer(admin, "IceBox", "localnode", params);
-	TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("RoundRobin"));
-	try
-	{
-	    test(obj->getReplicaIdAndShutdown() == "IceBox1.Service1.Service1");
-	    test(obj->getReplicaIdAndShutdown() == "IceBox1.Service2.Service2");
-	    test(obj->getReplicaIdAndShutdown() == "IceBox1.Service3.Service3");
-	}
-	catch(const Ice::LocalException& ex)
-	{
-	    cerr << ex << endl;
-	    test(false);
-	}
-	removeServer(admin, "IceBox1");
+        map<string, string> params;
+        params["replicaGroup"] = "RoundRobin";
+        params["id"] = "IceBox1";
+        instantiateServer(admin, "IceBox", "localnode", params);
+        TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("RoundRobin"));
+        try
+        {
+            test(obj->getReplicaIdAndShutdown() == "IceBox1.Service1.Service1");
+            test(obj->getReplicaIdAndShutdown() == "IceBox1.Service2.Service2");
+            test(obj->getReplicaIdAndShutdown() == "IceBox1.Service3.Service3");
+        }
+        catch(const Ice::LocalException& ex)
+        {
+            cerr << ex << endl;
+            test(false);
+        }
+        removeServer(admin, "IceBox1");
     }
     cout << "ok" << endl;
 
     cout << "testing replication with ordered load balancing... " << flush;
     {
-	map<string, string> params;
-	params["replicaGroup"] = "Ordered";
-	params["id"] = "Server1";
-	params["priority"] = "3";
-	instantiateServer(admin, "Server", "localnode", params);
-	params["id"] = "Server2";
-	params["priority"] = "1";
-	instantiateServer(admin, "Server", "localnode", params);
-	params["id"] = "Server3";
-	params["priority"] = "2";
-	instantiateServer(admin, "Server", "localnode", params);
-	TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("Ordered"));
-	try
-	{
-	    test(obj->getReplicaIdAndShutdown() == "Server2.ReplicatedAdapter");
-	    admin->enableServer("Server2", false);
-	    test(obj->getReplicaIdAndShutdown() == "Server3.ReplicatedAdapter");
-	    admin->enableServer("Server3", false);
-	    test(obj->getReplicaIdAndShutdown() == "Server1.ReplicatedAdapter");
-	}
-	catch(const Ice::LocalException& ex)
-	{
-	    cerr << ex << endl;
-	    test(false);
-	}
-	removeServer(admin, "Server1");
-	removeServer(admin, "Server2");
-	removeServer(admin, "Server3");
+        map<string, string> params;
+        params["replicaGroup"] = "Ordered";
+        params["id"] = "Server1";
+        params["priority"] = "3";
+        instantiateServer(admin, "Server", "localnode", params);
+        params["id"] = "Server2";
+        params["priority"] = "1";
+        instantiateServer(admin, "Server", "localnode", params);
+        params["id"] = "Server3";
+        params["priority"] = "2";
+        instantiateServer(admin, "Server", "localnode", params);
+        TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("Ordered"));
+        try
+        {
+            test(obj->getReplicaIdAndShutdown() == "Server2.ReplicatedAdapter");
+            admin->enableServer("Server2", false);
+            test(obj->getReplicaIdAndShutdown() == "Server3.ReplicatedAdapter");
+            admin->enableServer("Server3", false);
+            test(obj->getReplicaIdAndShutdown() == "Server1.ReplicatedAdapter");
+        }
+        catch(const Ice::LocalException& ex)
+        {
+            cerr << ex << endl;
+            test(false);
+        }
+        removeServer(admin, "Server1");
+        removeServer(admin, "Server2");
+        removeServer(admin, "Server3");
     }
     {
-	map<string, string> params;
-	params["replicaGroup"] = "Ordered";
-	params["id"] = "IceBox1";
-	instantiateServer(admin, "IceBox", "localnode", params);
-	TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("Ordered"));
-	try
-	{
-	    test(obj->getReplicaIdAndShutdown() == "IceBox1.Service3.Service3");
-	    test(obj->getReplicaIdAndShutdown() == "IceBox1.Service2.Service2");
-	    test(obj->getReplicaIdAndShutdown() == "IceBox1.Service1.Service1");
-	}
-	catch(const Ice::LocalException& ex)
-	{
-	    cerr << ex << endl;
-	    test(false);
-	}
-	removeServer(admin, "IceBox1");
+        map<string, string> params;
+        params["replicaGroup"] = "Ordered";
+        params["id"] = "IceBox1";
+        instantiateServer(admin, "IceBox", "localnode", params);
+        TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("Ordered"));
+        try
+        {
+            test(obj->getReplicaIdAndShutdown() == "IceBox1.Service3.Service3");
+            test(obj->getReplicaIdAndShutdown() == "IceBox1.Service2.Service2");
+            test(obj->getReplicaIdAndShutdown() == "IceBox1.Service1.Service1");
+        }
+        catch(const Ice::LocalException& ex)
+        {
+            cerr << ex << endl;
+            test(false);
+        }
+        removeServer(admin, "IceBox1");
     }
     cout << "ok" << endl;
 
     cout << "testing replication with random load balancing... " << flush;
     {
-	map<string, string> params;
-	params["replicaGroup"] = "Random";
-	params["id"] = "Server1";
-	instantiateServer(admin, "Server", "localnode", params);
-	params["id"] = "Server2";
-	instantiateServer(admin, "Server", "localnode", params);
-	params["id"] = "Server3";
-	instantiateServer(admin, "Server", "localnode", params);
-	TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("Random"));
-	obj = TestIntfPrx::uncheckedCast(obj->ice_locatorCacheTimeout(0));
-	obj = TestIntfPrx::uncheckedCast(obj->ice_connectionCached(false));
-	set<string> replicaIds = serverReplicaIds;
-	while(!replicaIds.empty())
-	{
-	    try
-	    {
-		replicaIds.erase(obj->getReplicaId());
-	    }
-	    catch(const Ice::LocalException& ex)
-	    {
-		cerr << ex << endl;
-		test(false);
-	    }
-	}
-	removeServer(admin, "Server1");
-	removeServer(admin, "Server2");
-	removeServer(admin, "Server3");
+        map<string, string> params;
+        params["replicaGroup"] = "Random";
+        params["id"] = "Server1";
+        instantiateServer(admin, "Server", "localnode", params);
+        params["id"] = "Server2";
+        instantiateServer(admin, "Server", "localnode", params);
+        params["id"] = "Server3";
+        instantiateServer(admin, "Server", "localnode", params);
+        TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("Random"));
+        obj = TestIntfPrx::uncheckedCast(obj->ice_locatorCacheTimeout(0));
+        obj = TestIntfPrx::uncheckedCast(obj->ice_connectionCached(false));
+        set<string> replicaIds = serverReplicaIds;
+        while(!replicaIds.empty())
+        {
+            try
+            {
+                replicaIds.erase(obj->getReplicaId());
+            }
+            catch(const Ice::LocalException& ex)
+            {
+                cerr << ex << endl;
+                test(false);
+            }
+        }
+        removeServer(admin, "Server1");
+        removeServer(admin, "Server2");
+        removeServer(admin, "Server3");
     }
     {
-	map<string, string> params;
-	params["replicaGroup"] = "Random";
-	params["id"] = "IceBox1";
-	instantiateServer(admin, "IceBox", "localnode", params);
-	TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("Random"));
-	obj = TestIntfPrx::uncheckedCast(obj->ice_locatorCacheTimeout(0));
-	obj = TestIntfPrx::uncheckedCast(obj->ice_connectionCached(false));
-	set<string> replicaIds = svcReplicaIds;
-	while(!replicaIds.empty())
-	{
-	    try
-	    {
-		replicaIds.erase(obj->getReplicaId());
-	    }
-	    catch(const Ice::ConnectionRefusedException&)
-	    {
-	    }
-	    catch(const Ice::LocalException& ex)
-	    {
-		cerr << ex << endl;
-		test(false);
-	    }
-	}
-	removeServer(admin, "IceBox1");
+        map<string, string> params;
+        params["replicaGroup"] = "Random";
+        params["id"] = "IceBox1";
+        instantiateServer(admin, "IceBox", "localnode", params);
+        TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("Random"));
+        obj = TestIntfPrx::uncheckedCast(obj->ice_locatorCacheTimeout(0));
+        obj = TestIntfPrx::uncheckedCast(obj->ice_connectionCached(false));
+        set<string> replicaIds = svcReplicaIds;
+        while(!replicaIds.empty())
+        {
+            try
+            {
+                replicaIds.erase(obj->getReplicaId());
+            }
+            catch(const Ice::ConnectionRefusedException&)
+            {
+            }
+            catch(const Ice::LocalException& ex)
+            {
+                cerr << ex << endl;
+                test(false);
+            }
+        }
+        removeServer(admin, "IceBox1");
     }
     cout << "ok" << endl;
 
     cout << "testing replication with adaptive load balancing... " << flush;
     {
-	map<string, string> params;
-	params["replicaGroup"] = "Adaptive";
-	params["id"] = "Server1";
-	instantiateServer(admin, "Server", "localnode", params);
-	params["id"] = "Server2";
-	instantiateServer(admin, "Server", "localnode", params);
-	params["id"] = "Server3";
-	instantiateServer(admin, "Server", "localnode", params);
-	TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("Adaptive"));
-	obj = TestIntfPrx::uncheckedCast(obj->ice_locatorCacheTimeout(0));
-	obj = TestIntfPrx::uncheckedCast(obj->ice_connectionCached(false));
-	set<string> replicaIds = serverReplicaIds;
-	while(!replicaIds.empty())
-	{
-	    try
-	    {
-		replicaIds.erase(obj->getReplicaId());
-	    }
-	    catch(const Ice::LocalException& ex)
-	    {
-		cerr << ex << endl;
-		test(false);
-	    }
-	}
-	removeServer(admin, "Server1");
-	removeServer(admin, "Server2");
-	removeServer(admin, "Server3");
+        map<string, string> params;
+        params["replicaGroup"] = "Adaptive";
+        params["id"] = "Server1";
+        instantiateServer(admin, "Server", "localnode", params);
+        params["id"] = "Server2";
+        instantiateServer(admin, "Server", "localnode", params);
+        params["id"] = "Server3";
+        instantiateServer(admin, "Server", "localnode", params);
+        TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("Adaptive"));
+        obj = TestIntfPrx::uncheckedCast(obj->ice_locatorCacheTimeout(0));
+        obj = TestIntfPrx::uncheckedCast(obj->ice_connectionCached(false));
+        set<string> replicaIds = serverReplicaIds;
+        while(!replicaIds.empty())
+        {
+            try
+            {
+                replicaIds.erase(obj->getReplicaId());
+            }
+            catch(const Ice::LocalException& ex)
+            {
+                cerr << ex << endl;
+                test(false);
+            }
+        }
+        removeServer(admin, "Server1");
+        removeServer(admin, "Server2");
+        removeServer(admin, "Server3");
     }
     {
-	map<string, string> params;
-	params["replicaGroup"] = "Adaptive";
-	params["id"] = "IceBox1";
-	instantiateServer(admin, "IceBox", "localnode", params);
-	TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("Adaptive"));
-	obj = TestIntfPrx::uncheckedCast(obj->ice_locatorCacheTimeout(0));
-	obj = TestIntfPrx::uncheckedCast(obj->ice_connectionCached(false));
-	set<string> replicaIds = svcReplicaIds;
-	while(!replicaIds.empty())
-	{
-	    try
-	    {
-		replicaIds.erase(obj->getReplicaId());
-	    }
-	    catch(const Ice::ConnectionRefusedException&)
-	    {
-	    }
-	    catch(const Ice::LocalException& ex)
-	    {
-		cerr << ex << endl;
-		test(false);
-	    }
-	}
-	removeServer(admin, "IceBox1");
+        map<string, string> params;
+        params["replicaGroup"] = "Adaptive";
+        params["id"] = "IceBox1";
+        instantiateServer(admin, "IceBox", "localnode", params);
+        TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("Adaptive"));
+        obj = TestIntfPrx::uncheckedCast(obj->ice_locatorCacheTimeout(0));
+        obj = TestIntfPrx::uncheckedCast(obj->ice_connectionCached(false));
+        set<string> replicaIds = svcReplicaIds;
+        while(!replicaIds.empty())
+        {
+            try
+            {
+                replicaIds.erase(obj->getReplicaId());
+            }
+            catch(const Ice::ConnectionRefusedException&)
+            {
+            }
+            catch(const Ice::LocalException& ex)
+            {
+                cerr << ex << endl;
+                test(false);
+            }
+        }
+        removeServer(admin, "IceBox1");
     }
     cout << "ok" << endl;
 
     cout << "testing load balancing n-replicas..." << flush;
     {
-	TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("RoundRobin-2"));
-	obj = TestIntfPrx::uncheckedCast(obj->ice_locatorCacheTimeout(-1));
-	obj = TestIntfPrx::uncheckedCast(obj->ice_connectionCached(false));
-	try
-	{
-	    obj->ice_ping();
-	    test(false);
-	}
-	catch(const Ice::NoEndpointException&)
-	{
-	}
-
-	map<string, string> params;
-	params["replicaGroup"] = "RoundRobin-2";
-	params["id"] = "Server1";
-	instantiateServer(admin, "Server", "localnode", params);
-	params["id"] = "Server2";
-	instantiateServer(admin, "Server", "localnode", params);
-	params["id"] = "Server3";
-	instantiateServer(admin, "Server", "localnode", params);
-	try
-	{
-	    set<string> replicaIds;
-	    set<string> expected;
-	    replicaIds.insert("Server1.ReplicatedAdapter");
-	    replicaIds.insert("Server2.ReplicatedAdapter");
-	    expected = replicaIds;
-	    while(!replicaIds.empty())
-	    {
-		string replicaId = obj->getReplicaId();
-		test(expected.find(replicaId) != expected.end());
-		replicaIds.erase(replicaId);
-	    }
-	    obj->ice_locatorCacheTimeout(0)->ice_ping();
-	    replicaIds.insert("Server2.ReplicatedAdapter");
-	    replicaIds.insert("Server3.ReplicatedAdapter");
-	    expected = replicaIds;
-	    while(!replicaIds.empty())
-	    {
-		string replicaId = obj->getReplicaId();
-		test(expected.find(replicaId) != expected.end());
-		replicaIds.erase(replicaId);
-	    }
-	    obj->ice_locatorCacheTimeout(0)->ice_ping();
-	    replicaIds.insert("Server3.ReplicatedAdapter");
-	    replicaIds.insert("Server1.ReplicatedAdapter");
-	    expected = replicaIds;
-	    while(!replicaIds.empty())
-	    {
-		string replicaId = obj->getReplicaId();
-		test(expected.find(replicaId) != expected.end());
-		replicaIds.erase(replicaId);
-	    }
-	}
-	catch(const Ice::LocalException& ex)
-	{
-	    cerr << ex << endl;
-	    test(false);
-	}
-	removeServer(admin, "Server1");
-	removeServer(admin, "Server2");
-	removeServer(admin, "Server3");
+        TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("RoundRobin-2"));
+        obj = TestIntfPrx::uncheckedCast(obj->ice_locatorCacheTimeout(-1));
+        obj = TestIntfPrx::uncheckedCast(obj->ice_connectionCached(false));
+        try
+        {
+            obj->ice_ping();
+            test(false);
+        }
+        catch(const Ice::NoEndpointException&)
+        {
+        }
+
+        map<string, string> params;
+        params["replicaGroup"] = "RoundRobin-2";
+        params["id"] = "Server1";
+        instantiateServer(admin, "Server", "localnode", params);
+        params["id"] = "Server2";
+        instantiateServer(admin, "Server", "localnode", params);
+        params["id"] = "Server3";
+        instantiateServer(admin, "Server", "localnode", params);
+        try
+        {
+            set<string> replicaIds;
+            set<string> expected;
+            replicaIds.insert("Server1.ReplicatedAdapter");
+            replicaIds.insert("Server2.ReplicatedAdapter");
+            expected = replicaIds;
+            while(!replicaIds.empty())
+            {
+                string replicaId = obj->getReplicaId();
+                test(expected.find(replicaId) != expected.end());
+                replicaIds.erase(replicaId);
+            }
+            obj->ice_locatorCacheTimeout(0)->ice_ping();
+            replicaIds.insert("Server2.ReplicatedAdapter");
+            replicaIds.insert("Server3.ReplicatedAdapter");
+            expected = replicaIds;
+            while(!replicaIds.empty())
+            {
+                string replicaId = obj->getReplicaId();
+                test(expected.find(replicaId) != expected.end());
+                replicaIds.erase(replicaId);
+            }
+            obj->ice_locatorCacheTimeout(0)->ice_ping();
+            replicaIds.insert("Server3.ReplicatedAdapter");
+            replicaIds.insert("Server1.ReplicatedAdapter");
+            expected = replicaIds;
+            while(!replicaIds.empty())
+            {
+                string replicaId = obj->getReplicaId();
+                test(expected.find(replicaId) != expected.end());
+                replicaIds.erase(replicaId);
+            }
+        }
+        catch(const Ice::LocalException& ex)
+        {
+            cerr << ex << endl;
+            test(false);
+        }
+        removeServer(admin, "Server1");
+        removeServer(admin, "Server2");
+        removeServer(admin, "Server3");
 
     }
     {
-	TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("RoundRobin-All"));
-	obj = TestIntfPrx::uncheckedCast(obj->ice_locatorCacheTimeout(-1));
-	obj = TestIntfPrx::uncheckedCast(obj->ice_connectionCached(false));
-	try
-	{
-	    obj->ice_ping();
-	    test(false);
-	}
-	catch(const Ice::NoEndpointException&)
-	{
-	}
-
-	map<string, string> params;
-	params["replicaGroup"] = "RoundRobin-All";
-	params["id"] = "Server1";
-	instantiateServer(admin, "Server", "localnode", params);
-	params["id"] = "Server2";
-	instantiateServer(admin, "Server", "localnode", params);
-	params["id"] = "Server3";
-	instantiateServer(admin, "Server", "localnode", params);
-	try
-	{
-	    set<string> replicaIds;
-	    set<string> expected;
-	    replicaIds.insert("Server1.ReplicatedAdapter");
-	    replicaIds.insert("Server2.ReplicatedAdapter");
-	    replicaIds.insert("Server3.ReplicatedAdapter");
-	    expected = replicaIds;
-	    while(!replicaIds.empty())
-	    {
-		string replicaId = obj->getReplicaId();
-		test(expected.find(replicaId) != expected.end());
-		replicaIds.erase(replicaId);
-	    }
-	    obj->ice_locatorCacheTimeout(0)->ice_ping();
-	    replicaIds.insert("Server1.ReplicatedAdapter");
-	    replicaIds.insert("Server2.ReplicatedAdapter");
-	    replicaIds.insert("Server3.ReplicatedAdapter");
-	    expected = replicaIds;
-	    while(!replicaIds.empty())
-	    {
-		string replicaId = obj->getReplicaId();
-		test(expected.find(replicaId) != expected.end());
-		replicaIds.erase(replicaId);
-	    }
-	}
-	catch(const Ice::LocalException& ex)
-	{
-	    cerr << ex << endl;
-	    test(false);
-	}
-	removeServer(admin, "Server1");
-	removeServer(admin, "Server2");
-	removeServer(admin, "Server3");
+        TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("RoundRobin-All"));
+        obj = TestIntfPrx::uncheckedCast(obj->ice_locatorCacheTimeout(-1));
+        obj = TestIntfPrx::uncheckedCast(obj->ice_connectionCached(false));
+        try
+        {
+            obj->ice_ping();
+            test(false);
+        }
+        catch(const Ice::NoEndpointException&)
+        {
+        }
+
+        map<string, string> params;
+        params["replicaGroup"] = "RoundRobin-All";
+        params["id"] = "Server1";
+        instantiateServer(admin, "Server", "localnode", params);
+        params["id"] = "Server2";
+        instantiateServer(admin, "Server", "localnode", params);
+        params["id"] = "Server3";
+        instantiateServer(admin, "Server", "localnode", params);
+        try
+        {
+            set<string> replicaIds;
+            set<string> expected;
+            replicaIds.insert("Server1.ReplicatedAdapter");
+            replicaIds.insert("Server2.ReplicatedAdapter");
+            replicaIds.insert("Server3.ReplicatedAdapter");
+            expected = replicaIds;
+            while(!replicaIds.empty())
+            {
+                string replicaId = obj->getReplicaId();
+                test(expected.find(replicaId) != expected.end());
+                replicaIds.erase(replicaId);
+            }
+            obj->ice_locatorCacheTimeout(0)->ice_ping();
+            replicaIds.insert("Server1.ReplicatedAdapter");
+            replicaIds.insert("Server2.ReplicatedAdapter");
+            replicaIds.insert("Server3.ReplicatedAdapter");
+            expected = replicaIds;
+            while(!replicaIds.empty())
+            {
+                string replicaId = obj->getReplicaId();
+                test(expected.find(replicaId) != expected.end());
+                replicaIds.erase(replicaId);
+            }
+        }
+        catch(const Ice::LocalException& ex)
+        {
+            cerr << ex << endl;
+            test(false);
+        }
+        removeServer(admin, "Server1");
+        removeServer(admin, "Server2");
+        removeServer(admin, "Server3");
 
     }
     cout << "ok" << endl;
 
     cout << "testing replication with inactive nodes... " << flush;
     {
-	map<string, string> params;
-
-	params["replicaGroup"] = "Random";
-	params["id"] = "Server1";
-	instantiateServer(admin, "Server", "inactivenode", params);
-	params["id"] = "Server2";
-	instantiateServer(admin, "Server", "localnode", params);
-	TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("Random"));
-	test(obj->getReplicaId() == "Server2.ReplicatedAdapter");
-
-	//
-	// Also make sure that findObjectByTypeOnLeastLoadedNode still work.
-	//
-	QueryPrx query = IceGrid::QueryPrx::checkedCast(comm->stringToProxy("IceGrid/Query"));
-	obj = TestIntfPrx::uncheckedCast(query->findObjectByTypeOnLeastLoadedNode("::Test::TestIntf", LoadSample1));
-	test(obj->getReplicaId() == "Server2.ReplicatedAdapter");
-	
-	removeServer(admin, "Server1");
-	removeServer(admin, "Server2");
-
-	params["replicaGroup"] = "RoundRobin";
-	params["id"] = "Server1";
-	instantiateServer(admin, "Server", "inactivenode", params);
-	params["id"] = "Server2";
-	instantiateServer(admin, "Server", "localnode", params);
-	obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("RoundRobin"));
-	test(obj->getReplicaId() == "Server2.ReplicatedAdapter");
-	removeServer(admin, "Server1");
-	removeServer(admin, "Server2");
-
-	params["replicaGroup"] = "Adaptive";
-	params["id"] = "Server1";
-	instantiateServer(admin, "Server", "inactivenode", params);
-	params["id"] = "Server2";
-	instantiateServer(admin, "Server", "localnode", params);
-	obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("Adaptive"));
-	test(obj->getReplicaId() == "Server2.ReplicatedAdapter");
-	removeServer(admin, "Server1");
-	removeServer(admin, "Server2");
-
-	params["replicaGroup"] = "Random";
-	params["id"] = "IceBox1";
-	instantiateServer(admin, "IceBox", "localnode", params);
-	params["id"] = "Server1";
-	instantiateServer(admin, "Server", "inactivenode", params);
-	obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("Random"));
-	test(svcReplicaIds.find(obj->getReplicaId()) != svcReplicaIds.end());
-	removeServer(admin, "IceBox1");
-	removeServer(admin, "Server1");
+        map<string, string> params;
+
+        params["replicaGroup"] = "Random";
+        params["id"] = "Server1";
+        instantiateServer(admin, "Server", "inactivenode", params);
+        params["id"] = "Server2";
+        instantiateServer(admin, "Server", "localnode", params);
+        TestIntfPrx obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("Random"));
+        test(obj->getReplicaId() == "Server2.ReplicatedAdapter");
+
+        //
+        // Also make sure that findObjectByTypeOnLeastLoadedNode still work.
+        //
+        QueryPrx query = IceGrid::QueryPrx::checkedCast(comm->stringToProxy("IceGrid/Query"));
+        obj = TestIntfPrx::uncheckedCast(query->findObjectByTypeOnLeastLoadedNode("::Test::TestIntf", LoadSample1));
+        test(obj->getReplicaId() == "Server2.ReplicatedAdapter");
+        
+        removeServer(admin, "Server1");
+        removeServer(admin, "Server2");
+
+        params["replicaGroup"] = "RoundRobin";
+        params["id"] = "Server1";
+        instantiateServer(admin, "Server", "inactivenode", params);
+        params["id"] = "Server2";
+        instantiateServer(admin, "Server", "localnode", params);
+        obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("RoundRobin"));
+        test(obj->getReplicaId() == "Server2.ReplicatedAdapter");
+        removeServer(admin, "Server1");
+        removeServer(admin, "Server2");
+
+        params["replicaGroup"] = "Adaptive";
+        params["id"] = "Server1";
+        instantiateServer(admin, "Server", "inactivenode", params);
+        params["id"] = "Server2";
+        instantiateServer(admin, "Server", "localnode", params);
+        obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("Adaptive"));
+        test(obj->getReplicaId() == "Server2.ReplicatedAdapter");
+        removeServer(admin, "Server1");
+        removeServer(admin, "Server2");
+
+        params["replicaGroup"] = "Random";
+        params["id"] = "IceBox1";
+        instantiateServer(admin, "IceBox", "localnode", params);
+        params["id"] = "Server1";
+        instantiateServer(admin, "Server", "inactivenode", params);
+        obj = TestIntfPrx::uncheckedCast(comm->stringToProxy("Random"));
+        test(svcReplicaIds.find(obj->getReplicaId()) != svcReplicaIds.end());
+        removeServer(admin, "IceBox1");
+        removeServer(admin, "Server1");
     };
     cout << "ok" << endl;