diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-06-16 13:19:20 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-06-16 13:19:20 +0000 |
| commit | e44cfc240ae1eb4d9df2d74ab1c7e9d0f0a817ff (patch) | |
| tree | 6b89768c7a33835c9df9dcb720dd173d807e5e84 /cpp/src/IceGrid/AdapterCache.cpp | |
| parent | Added (diff) | |
| download | ice-e44cfc240ae1eb4d9df2d74ab1c7e9d0f0a817ff.tar.bz2 ice-e44cfc240ae1eb4d9df2d74ab1c7e9d0f0a817ff.tar.xz ice-e44cfc240ae1eb4d9df2d74ab1c7e9d0f0a817ff.zip | |
Fixed bug 1054, 1077, 1002.
Diffstat (limited to 'cpp/src/IceGrid/AdapterCache.cpp')
| -rw-r--r-- | cpp/src/IceGrid/AdapterCache.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/IceGrid/AdapterCache.cpp b/cpp/src/IceGrid/AdapterCache.cpp index 74e71a95a33..952a58d7686 100644 --- a/cpp/src/IceGrid/AdapterCache.cpp +++ b/cpp/src/IceGrid/AdapterCache.cpp @@ -205,7 +205,7 @@ ServerAdapterEntry::getProxies(int& nReplicas, bool& replicaGroup) vector<pair<string, AdapterPrx> > adapters; nReplicas = 1; replicaGroup = false; - adapters.push_back(make_pair(_id, getProxy(""))); + adapters.push_back(make_pair(_id, getProxy("", true))); return adapters; } @@ -229,7 +229,7 @@ ServerAdapterEntry::getAdapterInfo() const info.replicaGroupId = _replicaGroupId; try { - info.proxy = getProxy("")->getDirectProxy(); + info.proxy = getProxy("", true)->getDirectProxy(); } catch(const Ice::Exception&) { @@ -240,11 +240,11 @@ ServerAdapterEntry::getAdapterInfo() const } AdapterPrx -ServerAdapterEntry::getProxy(const string& replicaGroupId) const +ServerAdapterEntry::getProxy(const string& replicaGroupId, bool upToDate) const { if(replicaGroupId.empty()) { - return getServer()->getAdapter(_id); + return getServer()->getAdapter(_id, upToDate); } else { @@ -253,7 +253,7 @@ ServerAdapterEntry::getProxy(const string& replicaGroupId) const { throw Ice::InvalidReplicaGroupIdException(); } - return _server->getAdapter(_id); + return _server->getAdapter(_id, upToDate); } } @@ -401,7 +401,7 @@ ReplicaGroupEntry::getProxies(int& nReplicas, bool& replicaGroup) { try { - adapters.push_back(make_pair(p->first, p->second->getProxy(_id))); + adapters.push_back(make_pair(p->first, p->second->getProxy(_id, true))); } catch(const AdapterNotExistException&) { |