diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-03-04 23:42:26 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-03-04 23:42:26 +0100 |
| commit | cdd4b28c36cf1b919cfbd0eda0678744d1563e9e (patch) | |
| tree | 9c3ea6eb1e9c9d2c695d75522380389dc014fd7f /cpp/src/IceGrid/AdapterCache.h | |
| parent | Alphabetized (diff) | |
| download | ice-cdd4b28c36cf1b919cfbd0eda0678744d1563e9e.tar.bz2 ice-cdd4b28c36cf1b919cfbd0eda0678744d1563e9e.tar.xz ice-cdd4b28c36cf1b919cfbd0eda0678744d1563e9e.zip | |
Fixed bug 3776, 3755, 3778 - getAdmin bugs and replicaGroup test warnings
Diffstat (limited to 'cpp/src/IceGrid/AdapterCache.h')
| -rw-r--r-- | cpp/src/IceGrid/AdapterCache.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cpp/src/IceGrid/AdapterCache.h b/cpp/src/IceGrid/AdapterCache.h index 8ee42bc1531..cb3216405b7 100644 --- a/cpp/src/IceGrid/AdapterCache.h +++ b/cpp/src/IceGrid/AdapterCache.h @@ -44,12 +44,9 @@ public: AdapterEntry(AdapterCache&, const std::string&, const std::string&); virtual void getLocatorAdapterInfo(LocatorAdapterInfoSeq&, int&, bool&, bool&, const std::set<std::string>&) = 0; - void getLocatorAdapterInfo(LocatorAdapterInfoSeq& adapters, int& count, bool& replicaGroup, bool& roundRobin) - { - getLocatorAdapterInfo(adapters, count, replicaGroup, roundRobin, std::set<std::string>()); - } virtual float getLeastLoadedNodeLoad(LoadSample) const = 0; virtual AdapterInfoSeq getAdapterInfo() const = 0; + virtual AdapterPrx getProxy(const std::string&, bool) const = 0; virtual bool canRemove(); @@ -74,9 +71,9 @@ public: virtual void getLocatorAdapterInfo(LocatorAdapterInfoSeq&, int&, bool&, bool&, const std::set<std::string>&); virtual float getLeastLoadedNodeLoad(LoadSample) const; virtual AdapterInfoSeq getAdapterInfo() const; - virtual const std::string& getReplicaGroupId() const { return _replicaGroupId; } + virtual AdapterPrx getProxy(const std::string&, bool) const; - AdapterPrx getProxy(const std::string&, bool) const; + const std::string& getReplicaGroupId() const { return _replicaGroupId; } int getPriority() const; private: @@ -96,6 +93,7 @@ public: virtual void getLocatorAdapterInfo(LocatorAdapterInfoSeq&, int&, bool&, bool&, const std::set<std::string>&); virtual float getLeastLoadedNodeLoad(LoadSample) const; virtual AdapterInfoSeq getAdapterInfo() const; + virtual AdapterPrx getProxy(const std::string&, bool) const { return 0; } void addReplica(const std::string&, const ServerAdapterEntryPtr&); void removeReplica(const std::string&); |