diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-07-08 13:47:30 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-07-08 13:47:30 +0000 |
| commit | 99894938dbde9a0bb10fc1998d9863cae52b8977 (patch) | |
| tree | 5b68e52e9a62792f11d8a4e2c844d394cd39f496 /cpp/src/IceGrid/ServerI.cpp | |
| parent | Fixed Ice interoperability issue (diff) | |
| download | ice-99894938dbde9a0bb10fc1998d9863cae52b8977.tar.bz2 ice-99894938dbde9a0bb10fc1998d9863cae52b8977.tar.xz ice-99894938dbde9a0bb10fc1998d9863cae52b8977.zip | |
More adapter replication changes.
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index dbbce6c3467..700fe32da2d 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -977,12 +977,12 @@ ServerI::addAdapter(const AdapterDescriptor& descriptor, const Ice::Current& cur { Ice::Identity id; id.category = "IceGridServerAdapter"; - id.name = _desc->name + "-" + descriptor.id; + id.name = _desc->name + "-" + descriptor.id + "-" + _desc->name; AdapterPrx proxy = AdapterPrx::uncheckedCast(current.adapter->createProxy(id)); ServerAdapterIPtr servant = ServerAdapterIPtr::dynamicCast(current.adapter->find(id)); if(!servant) { - servant = new ServerAdapterI(_node, this, proxy, descriptor.id, _waitTime); + servant = new ServerAdapterI(_node, this, _desc->name, proxy, descriptor.id, _waitTime); current.adapter->add(servant, id); } _adapters.insert(make_pair(descriptor.id, servant)); @@ -1180,3 +1180,4 @@ ServerI::toServerState(InternalServerState st) const return IceGrid::Destroyed; } } + |