diff options
Diffstat (limited to 'cpp/test/Ice/location/TestI.cpp')
| -rw-r--r-- | cpp/test/Ice/location/TestI.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/cpp/test/Ice/location/TestI.cpp b/cpp/test/Ice/location/TestI.cpp index 13a711924b6..099da3e0d96 100644 --- a/cpp/test/Ice/location/TestI.cpp +++ b/cpp/test/Ice/location/TestI.cpp @@ -19,7 +19,7 @@ ServerManagerI::ServerManagerI(const Ice::ObjectAdapterPtr& adapter, const Serve } void -ServerManagerI::startServer(const Ice::Current&) +ServerManagerI::startServer(const Ice::Current& current) { int argc = 0; char** argv = 0; @@ -55,8 +55,8 @@ ServerManagerI::startServer(const Ice::Current&) adapter2->setLocator(Ice::LocatorPrx::uncheckedCast(locator)); Ice::ObjectPtr object = new TestI(adapter, adapter2, _registry); - _registry->addObject(adapter->add(object, Ice::stringToIdentity("test"))); - _registry->addObject(adapter->add(object, Ice::stringToIdentity("test2"))); + _registry->addObject(adapter->add(object, serverCommunicator->stringToIdentity("test"))); + _registry->addObject(adapter->add(object, serverCommunicator->stringToIdentity("test2"))); adapter->activate(); adapter2->activate(); @@ -78,7 +78,7 @@ TestI::TestI(const Ice::ObjectAdapterPtr& adapter, const ServerLocatorRegistryPtr& registry) : _adapter1(adapter), _adapter2(adapter2), _registry(registry) { - _registry->addObject(_adapter1->add(new HelloI(), Ice::stringToIdentity("hello"))); + _registry->addObject(_adapter1->add(new HelloI(), _adapter1->getCommunicator()->stringToIdentity("hello"))); } void @@ -90,19 +90,20 @@ TestI::shutdown(const Ice::Current&) HelloPrx TestI::getHello(const Ice::Current&) { - return HelloPrx::uncheckedCast(_adapter1->createIndirectProxy(Ice::stringToIdentity("hello"))); + return HelloPrx::uncheckedCast(_adapter1->createIndirectProxy( + _adapter1->getCommunicator()->stringToIdentity("hello"))); } HelloPrx TestI::getReplicatedHello(const Ice::Current&) { - return HelloPrx::uncheckedCast(_adapter1->createProxy(Ice::stringToIdentity("hello"))); + return HelloPrx::uncheckedCast(_adapter1->createProxy(_adapter1->getCommunicator()->stringToIdentity("hello"))); } void TestI::migrateHello(const Ice::Current&) { - const Ice::Identity id = Ice::stringToIdentity("hello"); + const Ice::Identity id = _adapter1->getCommunicator()->stringToIdentity("hello"); try { _registry->addObject(_adapter2->add(_adapter1->remove(id), id)); |