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/ConnectionFactory.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/ConnectionFactory.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionFactory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp index 23ae8d63429..064dd10f0a6 100644 --- a/cpp/src/Ice/ConnectionFactory.cpp +++ b/cpp/src/Ice/ConnectionFactory.cpp @@ -227,7 +227,7 @@ IceInternal::OutgoingConnectionFactory::create(const vector<EndpointIPtr>& endpt // Try to establish the connection to the connectors. // DefaultsAndOverridesPtr defaultsAndOverrides = _instance->defaultsAndOverrides(); - const CommunicatorObserverPtr& obsv = _instance->getObserver(); + const CommunicatorObserverPtr& obsv = _instance->initializationData().observer; vector<ConnectorInfo>::const_iterator q; for(q = connectors.begin(); q != connectors.end(); ++q) { @@ -1139,7 +1139,7 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::nextConnector() try { - const CommunicatorObserverPtr& obsv = _factory->_instance->getObserver(); + const CommunicatorObserverPtr& obsv = _factory->_instance->initializationData().observer; if(obsv) { _observer = obsv->getConnectionEstablishmentObserver(_iter->endpoint, _iter->connector->toString()); |