summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/AdapterCache.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2005-11-08 10:00:09 +0000
committerBenoit Foucher <benoit@zeroc.com>2005-11-08 10:00:09 +0000
commit2496d1c85fe8bd9fe7f343084ba68ac99b7abaac (patch)
treeded7d3c012a30f978db0fb2ecf81fadcfcebfe52 /cpp/src/IceGrid/AdapterCache.cpp
parentwindows fixes for http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=534 (diff)
downloadice-2496d1c85fe8bd9fe7f343084ba68ac99b7abaac.tar.bz2
ice-2496d1c85fe8bd9fe7f343084ba68ac99b7abaac.tar.xz
ice-2496d1c85fe8bd9fe7f343084ba68ac99b7abaac.zip
Bug fixes
Diffstat (limited to 'cpp/src/IceGrid/AdapterCache.cpp')
-rw-r--r--cpp/src/IceGrid/AdapterCache.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/AdapterCache.cpp b/cpp/src/IceGrid/AdapterCache.cpp
index aff2dd311d9..2eedddda998 100644
--- a/cpp/src/IceGrid/AdapterCache.cpp
+++ b/cpp/src/IceGrid/AdapterCache.cpp
@@ -148,7 +148,7 @@ ServerAdapterEntry::ServerAdapterEntry(Cache<string, AdapterEntry>& cache, const
}
vector<pair<string, AdapterPrx> >
-ServerAdapterEntry::getProxies(int& nReplicas)
+ServerAdapterEntry::getProxies(bool, int& nReplicas)
{
vector<pair<string, AdapterPrx> > adapters;
try
@@ -302,7 +302,7 @@ ReplicaGroupEntry::removeReplica(const string& replicaId)
}
vector<pair<string, AdapterPrx> >
-ReplicaGroupEntry::getProxies(int& nReplicas)
+ReplicaGroupEntry::getProxies(bool allRegistered, int& nReplicas)
{
ReplicaSeq replicas;
bool adaptive = false;
@@ -368,6 +368,10 @@ ReplicaGroupEntry::getProxies(int& nReplicas)
}
catch(const NodeUnreachableException&)
{
+ if(allRegistered)
+ {
+ adapters.push_back(make_pair(p->first, AdapterPrx()));
+ }
}
}
return adapters;