diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-01-30 16:51:24 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-01-30 16:51:24 +0100 |
| commit | 6f99bac58a16e55487b98ddb5d6f837574c55b02 (patch) | |
| tree | 20db5f71eeee5c7eb0796aed44a150206dff14b0 /cpp/src/IceGrid/ServerAdapterI.h | |
| parent | ICE-4775 - memory leak in Glacier2 (diff) | |
| download | ice-6f99bac58a16e55487b98ddb5d6f837574c55b02.tar.bz2 ice-6f99bac58a16e55487b98ddb5d6f837574c55b02.tar.xz ice-6f99bac58a16e55487b98ddb5d6f837574c55b02.zip | |
Fixed ICE-4772, IceGrid server disable patch for Cengage
Diffstat (limited to 'cpp/src/IceGrid/ServerAdapterI.h')
| -rw-r--r-- | cpp/src/IceGrid/ServerAdapterI.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/ServerAdapterI.h b/cpp/src/IceGrid/ServerAdapterI.h index 12ba4e0e45a..ad9762d96e3 100644 --- a/cpp/src/IceGrid/ServerAdapterI.h +++ b/cpp/src/IceGrid/ServerAdapterI.h @@ -25,13 +25,14 @@ class ServerAdapterI : public Adapter, public IceUtil::Mutex { public: - ServerAdapterI(const NodeIPtr&, ServerI*, const std::string&, const AdapterPrx&, const std::string&); + ServerAdapterI(const NodeIPtr&, ServerI*, const std::string&, const AdapterPrx&, const std::string&, bool); virtual ~ServerAdapterI(); virtual void activate_async(const AMD_Adapter_activatePtr& cb, const Ice::Current&); virtual Ice::ObjectPrx getDirectProxy(const Ice::Current& = Ice::Current()) const; virtual void setDirectProxy(const ::Ice::ObjectPrx&, const ::Ice::Current& = Ice::Current()); void destroy(); + void updateEnabled(); void clear(); void activationFailed(const std::string&); void activationCompleted(); @@ -48,6 +49,7 @@ private: ServerI* _server; Ice::ObjectPrx _proxy; + bool _enabled; std::vector<AMD_Adapter_activatePtr> _activateCB; bool _activateAfterDeactivating; }; |