diff options
Diffstat (limited to 'cpp/test/Ice/location/TestI.cpp')
-rw-r--r-- | cpp/test/Ice/location/TestI.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/test/Ice/location/TestI.cpp b/cpp/test/Ice/location/TestI.cpp index 1eb60dea2bf..d5f22b48672 100644 --- a/cpp/test/Ice/location/TestI.cpp +++ b/cpp/test/Ice/location/TestI.cpp @@ -14,8 +14,8 @@ using namespace Test; ServerManagerI::ServerManagerI(const Ice::ObjectAdapterPtr& adapter, - const ServerLocatorRegistryPtr& registry, - const Ice::InitializationData& initData) : + const ServerLocatorRegistryPtr& registry, + const Ice::InitializationData& initData) : _adapter(adapter), _registry(registry), _initData(initData) { _initData.properties->setProperty("Ice.OA.TestAdapter.Endpoints", "default"); @@ -33,8 +33,8 @@ ServerManagerI::startServer(const Ice::Current& current) { for(::std::vector<Ice::CommunicatorPtr>::const_iterator i = _communicators.begin(); i != _communicators.end(); ++i) { - (*i)->waitForShutdown(); - (*i)->destroy(); + (*i)->waitForShutdown(); + (*i)->destroy(); } _communicators.clear(); @@ -70,15 +70,15 @@ ServerManagerI::shutdown(const Ice::Current&) { for(::std::vector<Ice::CommunicatorPtr>::const_iterator i = _communicators.begin(); i != _communicators.end(); ++i) { - (*i)->destroy(); + (*i)->destroy(); } _adapter->getCommunicator()->shutdown(); } TestI::TestI(const Ice::ObjectAdapterPtr& adapter, - const Ice::ObjectAdapterPtr& adapter2, - const ServerLocatorRegistryPtr& registry) : + const Ice::ObjectAdapterPtr& adapter2, + const ServerLocatorRegistryPtr& registry) : _adapter1(adapter), _adapter2(adapter2), _registry(registry) { _registry->addObject(_adapter1->add(new HelloI(), _adapter1->getCommunicator()->stringToIdentity("hello"))); @@ -94,7 +94,7 @@ HelloPrx TestI::getHello(const Ice::Current&) { return HelloPrx::uncheckedCast(_adapter1->createIndirectProxy( - _adapter1->getCommunicator()->stringToIdentity("hello"))); + _adapter1->getCommunicator()->stringToIdentity("hello"))); } HelloPrx @@ -109,11 +109,11 @@ TestI::migrateHello(const Ice::Current&) const Ice::Identity id = _adapter1->getCommunicator()->stringToIdentity("hello"); try { - _registry->addObject(_adapter2->add(_adapter1->remove(id), id)); + _registry->addObject(_adapter2->add(_adapter1->remove(id), id)); } catch(Ice::NotRegisteredException&) { - _registry->addObject(_adapter1->add(_adapter2->remove(id), id)); + _registry->addObject(_adapter1->add(_adapter2->remove(id), id)); } } |