diff options
Diffstat (limited to 'cpp/src/IceGrid/Database.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Database.cpp | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp index 954efeb75fa..ff7858f900b 100644 --- a/cpp/src/IceGrid/Database.cpp +++ b/cpp/src/IceGrid/Database.cpp @@ -1613,7 +1613,6 @@ Database::reload(const ApplicationHelper& oldApp, map<string, ServerInfo> oldServers = oldApp.getServerInfos(uuid, revision); map<string, ServerInfo> newServers = newApp.getServerInfos(uuid, revision); vector<ServerInfo> load; - vector<string> updateRev; map<string, ServerInfo>::const_iterator p; for(p = newServers.begin(); p != newServers.end(); ++p) { @@ -1622,16 +1621,11 @@ Database::reload(const ApplicationHelper& oldApp, { load.push_back(p->second); } - else if(p->second.node != q->second.node || - !descriptorEqual(_communicator, p->second.descriptor, q->second.descriptor)) + else { _serverCache.remove(p->first, false); // Don't destroy the server if it was updated. load.push_back(p->second); } - else - { - updateRev.push_back(p->first); - } } for(p = oldServers.begin(); p != oldServers.end(); ++p) { @@ -1640,10 +1634,6 @@ Database::reload(const ApplicationHelper& oldApp, { entries.push_back(_serverCache.remove(p->first)); } - else - { - updateRev.push_back(p->first); - } } // @@ -1722,14 +1712,6 @@ Database::reload(const ApplicationHelper& oldApp, { entries.push_back(_serverCache.add(*q)); } - - // - // Just update the revision of the server. - // - for(vector<string>::const_iterator rp = updateRev.begin(); rp != updateRev.end(); ++rp) - { - _serverCache.get(*rp)->updateRevision(revision); - } } void |