diff options
Diffstat (limited to 'cpp/src/Ice/IPEndpointI.cpp')
| -rw-r--r-- | cpp/src/Ice/IPEndpointI.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/Ice/IPEndpointI.cpp b/cpp/src/Ice/IPEndpointI.cpp index acbfb356715..b8df1f4da07 100644 --- a/cpp/src/Ice/IPEndpointI.cpp +++ b/cpp/src/Ice/IPEndpointI.cpp @@ -550,7 +550,7 @@ IceInternal::EndpointHostResolver::resolve(const string& host, int port, Ice::En } ObserverHelperT<> observer; - const CommunicatorObserverPtr& obsv = _instance->getObserver(); + const CommunicatorObserverPtr& obsv = _instance->initializationData().observer; if(obsv) { observer.attach(obsv->getEndpointLookupObserver(endpoint)); @@ -615,7 +615,7 @@ IceInternal::EndpointHostResolver::resolve(const string& host, int port, Ice::En entry.endpoint = endpoint; entry.callback = callback; - const CommunicatorObserverPtr& obsv = _instance->getObserver(); + const CommunicatorObserverPtr& obsv = _instance->initializationData().observer; if(obsv) { entry.observer = obsv->getEndpointLookupObserver(endpoint); @@ -662,13 +662,13 @@ IceInternal::EndpointHostResolver::run() threadObserver = _observer.get(); } - try + if(threadObserver) { - if(threadObserver) - { - threadObserver->stateChanged(ThreadStateIdle, ThreadStateInUseForOther); - } + threadObserver->stateChanged(ThreadStateIdle, ThreadStateInUseForOther); + } + try + { NetworkProxyPtr networkProxy = _instance->networkProxy(); ProtocolSupport protocol = _protocol; if(networkProxy) @@ -735,7 +735,7 @@ void IceInternal::EndpointHostResolver::updateObserver() { Lock sync(*this); - const CommunicatorObserverPtr& obsv = _instance->getObserver(); + const CommunicatorObserverPtr& obsv = _instance->initializationData().observer; if(obsv) { _observer.attach(obsv->getThreadObserver("Communicator", name(), ThreadStateIdle, _observer.get())); |