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/ConnectionFactory.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/ConnectionFactory.h')
| -rw-r--r-- | cpp/src/Ice/ConnectionFactory.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h index e0bdb60bce2..037c21ff2c4 100644 --- a/cpp/src/Ice/ConnectionFactory.h +++ b/cpp/src/Ice/ConnectionFactory.h @@ -26,6 +26,7 @@ #include <Ice/EventHandler.h> #include <Ice/EndpointI.h> #include <Ice/InstrumentationF.h> +#include <Ice/ACMF.h> #include <list> #include <set> @@ -148,7 +149,7 @@ private: Ice::CommunicatorPtr _communicator; const InstancePtr _instance; - const ConnectionReaperPtr _reaper; + const FactoryACMMonitorPtr _monitor; bool _destroyed; std::multimap<ConnectorPtr, Ice::ConnectionIPtr> _connections; @@ -213,7 +214,7 @@ private: void setState(State); const InstancePtr _instance; - const ConnectionReaperPtr _reaper; + const FactoryACMMonitorPtr _monitor; const AcceptorPtr _acceptor; const TransceiverPtr _transceiver; |