summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/EndpointI.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-08-09 10:20:56 +0200
committerBenoit Foucher <benoit@zeroc.com>2012-08-09 10:20:56 +0200
commit62f9ccfd51f985db0539d9af7030c0461bb23008 (patch)
treef42692c3240096e7eb400bd698125ceeec11e436 /cpp/src/Ice/EndpointI.cpp
parentMerge remote-tracking branch 'origin/encoding11' into mx (diff)
downloadice-62f9ccfd51f985db0539d9af7030c0461bb23008.tar.bz2
ice-62f9ccfd51f985db0539d9af7030c0461bb23008.tar.xz
ice-62f9ccfd51f985db0539d9af7030c0461bb23008.zip
Fix
Diffstat (limited to 'cpp/src/Ice/EndpointI.cpp')
-rw-r--r--cpp/src/Ice/EndpointI.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp
index 688cbfc10e6..b084d8f4a8b 100644
--- a/cpp/src/Ice/EndpointI.cpp
+++ b/cpp/src/Ice/EndpointI.cpp
@@ -193,10 +193,10 @@ IceInternal::EndpointHostResolver::resolve(const string& host, int port, const E
{
vector<ConnectorPtr> connectors;
ObserverHelperT<> observer;
- const ObserverResolverPtr& resolver = _instance->initializationData().observerResolver;
- if(resolver)
+ const CommunicatorObserverPtr& obsv = _instance->initializationData().observer;
+ if(obsv)
{
- observer.attach(resolver->getEndpointResolveObserver(endpoint->getInfo(), endpoint->toString()));
+ observer.attach(obsv->getEndpointLookupObserver(endpoint->getInfo(), endpoint->toString()));
}
try
@@ -242,10 +242,10 @@ IceInternal::EndpointHostResolver::resolve(const string& host, int port, const E
entry.endpoint = endpoint;
entry.callback = callback;
- const ObserverResolverPtr& resolver = _instance->initializationData().observerResolver;
- if(resolver)
+ const CommunicatorObserverPtr& obsv = _instance->initializationData().observer;
+ if(obsv)
{
- entry.observer = resolver->getEndpointResolveObserver(endpoint->getInfo(), endpoint->toString());
+ entry.observer = obsv->getEndpointLookupObserver(endpoint->getInfo(), endpoint->toString());
if(entry.observer)
{
entry.observer->attach();
@@ -337,10 +337,10 @@ void
IceInternal::EndpointHostResolver::updateObserver()
{
Lock sync(*this);
- const ObserverResolverPtr& resolver = _instance->initializationData().observerResolver;
- if(resolver)
+ const CommunicatorObserverPtr& obsv = _instance->initializationData().observer;
+ if(obsv)
{
- _observer.attach(resolver->getThreadObserver("Communicator", name(), ThreadStateIdle, _observer.get()));
+ _observer.attach(obsv->getThreadObserver("Communicator", name(), ThreadStateIdle, _observer.get()));
}
}