diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-05-17 12:27:58 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-05-17 12:27:58 +0000 |
| commit | e52e31abbe3878540a3d79aec167fb24fe73de8e (patch) | |
| tree | 4dbd775cf9c3102c2c673ed3d03aa5653ea42408 /cpp/src/IceGrid/AdapterCache.h | |
| parent | Fixed bug 997 (diff) | |
| download | ice-e52e31abbe3878540a3d79aec167fb24fe73de8e.tar.bz2 ice-e52e31abbe3878540a3d79aec167fb24fe73de8e.tar.xz ice-e52e31abbe3878540a3d79aec167fb24fe73de8e.zip | |
More work on session activation.
Diffstat (limited to 'cpp/src/IceGrid/AdapterCache.h')
| -rw-r--r-- | cpp/src/IceGrid/AdapterCache.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/cpp/src/IceGrid/AdapterCache.h b/cpp/src/IceGrid/AdapterCache.h index cd9e30bdf19..427ed0cc662 100644 --- a/cpp/src/IceGrid/AdapterCache.h +++ b/cpp/src/IceGrid/AdapterCache.h @@ -15,7 +15,6 @@ #include <IceGrid/Cache.h> #include <IceGrid/Query.h> #include <IceGrid/Internal.h> -#include <IceGrid/Allocatable.h> namespace IceGrid { @@ -49,11 +48,11 @@ protected: }; typedef IceUtil::Handle<AdapterEntry> AdapterEntryPtr; -class ServerAdapterEntry : public AdapterEntry, public Allocatable +class ServerAdapterEntry : public AdapterEntry { public: - ServerAdapterEntry(AdapterCache&, const std::string&, const std::string&, bool, const ServerEntryPtr&); + ServerAdapterEntry(AdapterCache&, const std::string&, const std::string&, const ServerEntryPtr&); virtual std::vector<std::pair<std::string, AdapterPrx> > getProxies(int&); virtual float getLeastLoadedNodeLoad(LoadSample) const; @@ -63,9 +62,6 @@ public: AdapterPrx getProxy(const std::string& = std::string()) const; - virtual void allocated(const SessionIPtr&); - virtual void released(const SessionIPtr&); - private: ServerEntryPtr getServer() const; @@ -111,7 +107,7 @@ class AdapterCache : public CacheByString<AdapterEntry> { public: - ServerAdapterEntryPtr addServerAdapter(const std::string&, const std::string&, bool, const ServerEntryPtr&); + ServerAdapterEntryPtr addServerAdapter(const std::string&, const std::string&, const ServerEntryPtr&); ReplicaGroupEntryPtr addReplicaGroup(const std::string&, const std::string&, const LoadBalancingPolicyPtr&); AdapterEntryPtr get(const std::string&) const; |