diff options
author | Benoit Foucher <benoit@zeroc.com> | 2013-09-09 19:12:28 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2013-09-09 19:12:28 +0200 |
commit | 8a0d1c7e34d8bd18bd85666cce94403a5158975c (patch) | |
tree | 36050a818282c0a92ee88a6ef28354e186c5aebe /cpp/src/Ice/Instance.h | |
parent | Test scripts improvements (diff) | |
download | ice-8a0d1c7e34d8bd18bd85666cce94403a5158975c.tar.bz2 ice-8a0d1c7e34d8bd18bd85666cce94403a5158975c.tar.xz ice-8a0d1c7e34d8bd18bd85666cce94403a5158975c.zip |
Fixed ICE-5196: allow setting an observer with IceMX enabled
Diffstat (limited to 'cpp/src/Ice/Instance.h')
-rw-r--r-- | cpp/src/Ice/Instance.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h index 16aa25648b0..34261196016 100644 --- a/cpp/src/Ice/Instance.h +++ b/cpp/src/Ice/Instance.h @@ -93,6 +93,11 @@ public: void addAdminFacet(const Ice::ObjectPtr&, const std::string&); Ice::ObjectPtr removeAdminFacet(const std::string&); Ice::ObjectPtr findAdminFacet(const std::string&); + + const Ice::Instrumentation::CommunicatorObserverPtr& getObserver() const + { + return _observer; + } const Ice::ImplicitContextIPtr& getImplicitContext() const { @@ -157,6 +162,7 @@ private: Ice::Identity _adminIdentity; std::set<std::string> _adminFacetFilter; IceInternal::MetricsAdminIPtr _metricsAdmin; + Ice::Instrumentation::CommunicatorObserverPtr _observer; }; class ProcessI : public Ice::Process |