summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/EndpointI.cpp5
-rw-r--r--cpp/src/Ice/EndpointI.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp
index e951fedb78c..399e2acc1ca 100644
--- a/cpp/src/Ice/EndpointI.cpp
+++ b/cpp/src/Ice/EndpointI.cpp
@@ -360,14 +360,15 @@ IceInternal::EndpointHostResolver::updateObserver()
#else
-IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& instance)
+IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& instance) :
+ _instance(instance)
{
}
vector<ConnectorPtr>
IceInternal::EndpointHostResolver::resolve(const string& host, int port, const EndpointIPtr& endpoint)
{
- return endpoint->connectors();
+ return endpoint->connectors(getAddresses(host, port, _instance->protocolSupport(), false));
}
void
diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h
index 4d367f4b951..3dce9a7162a 100644
--- a/cpp/src/Ice/EndpointI.h
+++ b/cpp/src/Ice/EndpointI.h
@@ -220,6 +220,8 @@ private:
bool _destroyed;
std::deque<ResolveEntry> _queue;
ObserverHelperT<Ice::Instrumentation::ThreadObserver> _observer;
+#else
+ const InstancePtr _instance;
#endif
};