diff options
author | Benoit Foucher <benoit@zeroc.com> | 2006-09-22 14:30:53 +0000 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2006-09-22 14:30:53 +0000 |
commit | 059ea645ef16d220ff93cc2f6fd2316974d86a3b (patch) | |
tree | b724aa212cbb5e102645b6abbb10f1ce08b430f3 /cpp/src/IceGrid/ReplicaSessionManager.cpp | |
parent | fix version retrieval to sync with change to config/Make.rules (diff) | |
download | ice-059ea645ef16d220ff93cc2f6fd2316974d86a3b.tar.bz2 ice-059ea645ef16d220ff93cc2f6fd2316974d86a3b.tar.xz ice-059ea645ef16d220ff93cc2f6fd2316974d86a3b.zip |
Node proxies are now stored in a separate non-replicated map.
Diffstat (limited to 'cpp/src/IceGrid/ReplicaSessionManager.cpp')
-rw-r--r-- | cpp/src/IceGrid/ReplicaSessionManager.cpp | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/cpp/src/IceGrid/ReplicaSessionManager.cpp b/cpp/src/IceGrid/ReplicaSessionManager.cpp index 705dd2e3eb9..e121a307386 100644 --- a/cpp/src/IceGrid/ReplicaSessionManager.cpp +++ b/cpp/src/IceGrid/ReplicaSessionManager.cpp @@ -149,13 +149,7 @@ public: string failure; try { - const Ice::Identity& id = info.proxy->ice_getIdentity(); - if(id.category != _database->getInstanceName() || id.name.find("Node-") != 0) - { - // Don't replicate node well-known objects. These objects are - // maintained by each replica with each node session. - _database->addObject(info, true); - } + _database->addObject(info, true); } catch(const ObjectExistsException& ex) { @@ -173,13 +167,7 @@ public: string failure; try { - const Ice::Identity& id = info.proxy->ice_getIdentity(); - if(id.category != _database->getInstanceName() || id.name.find("Node-") != 0) - { - // Don't replicate node well-known objects. These objects are - // maintained by each replica with each node session. - _database->addObject(info, true); - } + _database->addObject(info, true); } catch(const DeploymentException& ex) { @@ -196,12 +184,7 @@ public: string failure; try { - if(id.category != _database->getInstanceName() || id.name.find("Node-") != 0) - { - // Don't replicate node well-known objects. These objects are - // maintained by each replica with each node session. - _database->removeObject(id); - } + _database->removeObject(id); } catch(const DeploymentException& ex) { |