diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-05-23 11:59:44 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-05-23 11:59:44 +0200 |
| commit | d81701ca8182942b7936f9fd84a019b695e9c890 (patch) | |
| tree | dc036c9d701fbbe1afad67782bd78572c0f61974 /cpp/src/Ice/ObjectAdapterI.h | |
| parent | Fixed bug ICE-5543: stringToIdentity bug with escaped escapes (diff) | |
| download | ice-d81701ca8182942b7936f9fd84a019b695e9c890.tar.bz2 ice-d81701ca8182942b7936f9fd84a019b695e9c890.tar.xz ice-d81701ca8182942b7936f9fd84a019b695e9c890.zip | |
Added support for invocation timeouts and ACM heartbeats
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.h')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h index 6b9267e4b37..55946b580ef 100644 --- a/cpp/src/Ice/ObjectAdapterI.h +++ b/cpp/src/Ice/ObjectAdapterI.h @@ -30,6 +30,7 @@ #include <Ice/Exception.h> #include <Ice/BuiltinSequences.h> #include <Ice/Proxy.h> +#include <Ice/ACM.h> #include <list> namespace Ice @@ -96,7 +97,7 @@ public: IceInternal::ThreadPoolPtr getThreadPool() const; IceInternal::ServantManagerPtr getServantManager() const; - Ice::Int getACM() const; + IceInternal::ACMConfig getACM() const; private: @@ -121,8 +122,7 @@ private: CommunicatorPtr _communicator; IceInternal::ObjectAdapterFactoryPtr _objectAdapterFactory; IceInternal::ThreadPoolPtr _threadPool; - bool _hasAcmTimeout; - Ice::Int _acmTimeout; + IceInternal::ACMConfig _acm; IceInternal::ServantManagerPtr _servantManager; bool _activateOneOffDone; const std::string _name; |