diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-09-12 13:24:38 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-09-12 13:24:38 +0200 |
| commit | abeebf67ba35156606bbaabf073b496900f836cf (patch) | |
| tree | 430212c34a1a1d4922fa11426e9fbd537fb98e52 /cpp/src/Ice/ObserverHelper.cpp | |
| parent | Fixed dependencies (diff) | |
| download | ice-abeebf67ba35156606bbaabf073b496900f836cf.tar.bz2 ice-abeebf67ba35156606bbaabf073b496900f836cf.tar.xz ice-abeebf67ba35156606bbaabf073b496900f836cf.zip | |
Fixed ICE-5620: metrics admin creation in IceBox, fixed bug where timer wasn't instrumented
Diffstat (limited to 'cpp/src/Ice/ObserverHelper.cpp')
| -rw-r--r-- | cpp/src/Ice/ObserverHelper.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/ObserverHelper.cpp b/cpp/src/Ice/ObserverHelper.cpp index dcbe0506d86..4e77077bce5 100644 --- a/cpp/src/Ice/ObserverHelper.cpp +++ b/cpp/src/Ice/ObserverHelper.cpp @@ -25,7 +25,7 @@ Ice::Context emptyCtx; IceInternal::InvocationObserver::InvocationObserver(IceProxy::Ice::Object* proxy, const string& op, const Context* ctx) { - const CommunicatorObserverPtr& obsv = proxy->__reference()->getInstance()->getObserver(); + const CommunicatorObserverPtr& obsv = proxy->__reference()->getInstance()->initializationData().observer; if(!obsv) { return; @@ -43,7 +43,7 @@ IceInternal::InvocationObserver::InvocationObserver(IceProxy::Ice::Object* proxy IceInternal::InvocationObserver::InvocationObserver(IceInternal::Instance* instance, const string& op) { - const CommunicatorObserverPtr& obsv = instance->getObserver(); + const CommunicatorObserverPtr& obsv = instance->initializationData().observer; if(!obsv) { return; @@ -55,7 +55,7 @@ IceInternal::InvocationObserver::InvocationObserver(IceInternal::Instance* insta void IceInternal::InvocationObserver::attach(IceProxy::Ice::Object* proxy, const string& op, const Context* ctx) { - const CommunicatorObserverPtr& obsv = proxy->__reference()->getInstance()->getObserver(); + const CommunicatorObserverPtr& obsv = proxy->__reference()->getInstance()->initializationData().observer; if(!obsv) { return; @@ -74,7 +74,7 @@ IceInternal::InvocationObserver::attach(IceProxy::Ice::Object* proxy, const stri void IceInternal::InvocationObserver::attach(IceInternal::Instance* instance, const string& op) { - const CommunicatorObserverPtr& obsv = instance->getObserver(); + const CommunicatorObserverPtr& obsv = instance->initializationData().observer; if(!obsv) { return; |