Bug 803 - changed communicator initialization.

1 files changed, 8 insertions, 8 deletions

diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index 6581ee98beb..e7c0df8aedf 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -315,7 +315,7 @@ IceInternal::OutgoingConnectionFactory::create(const vector<EndpointIPtr>& endpt
 	TraceLevelsPtr traceLevels = _instance->traceLevels();
 	if(traceLevels->retry >= 2)
 	{
-	    Trace out(_instance->logger(), traceLevels->retryCat);
+	    Trace out(_instance->initializationData().logger, traceLevels->retryCat);
 
 	    out << "connection to endpoint failed";
 	    if(moreEndpts || q + 1 != endpoints.end())
@@ -739,7 +739,7 @@ IceInternal::IncomingConnectionFactory::message(BasicStream&, const ThreadPoolPt
 	    // Warn about other Ice local exceptions.
 	    if(_warn)
 	    {
-		Warning out(_instance->logger());
+		Warning out(_instance->initializationData().logger);
 		out << "connection exception:\n" << ex << '\n' << _acceptor->toString();
 	    }
 	    return;
@@ -827,7 +827,7 @@ IceInternal::IncomingConnectionFactory::IncomingConnectionFactory(const Instance
     _adapter(adapter),
     _registeredWithPool(false),
     _finishedCount(0),
-    _warn(_instance->properties()->getPropertyAsInt("Ice.Warn.Connections") > 0),
+    _warn(_instance->initializationData().properties->getPropertyAsInt("Ice.Warn.Connections") > 0),
     _state(StateHolding)
 {
     if(_instance->defaultsAndOverrides()->overrideTimeout)
@@ -890,7 +890,7 @@ IceInternal::IncomingConnectionFactory::IncomingConnectionFactory(const Instance
 	    catch(const IceUtil::Exception& ex)
 	    {
 		{
-		    Error out(_instance->logger());
+		    Error out(_instance->initializationData().logger);
 		    out << "cannot create thread for incoming connection factory:\n" << ex;
 		}
 		
@@ -1056,7 +1056,7 @@ IceInternal::IncomingConnectionFactory::run()
 	    // Warn about other Ice local exceptions.
 	    if(_warn)
 	    {
-		Warning out(_instance->logger());
+		Warning out(_instance->initializationData().logger);
 		out << "connection exception:\n" << ex << '\n' << _acceptor->toString();
 	    }
 	}
@@ -1156,17 +1156,17 @@ IceInternal::IncomingConnectionFactory::ThreadPerIncomingConnectionFactory::run(
     }
     catch(const Exception& ex)
     {	
-	Error out(_factory->_instance->logger());
+	Error out(_factory->_instance->initializationData().logger);
 	out << "exception in thread per incoming connection factory:\n" << _factory->toString() << ex; 
     }
     catch(const std::exception& ex)
     {
-	Error out(_factory->_instance->logger());
+	Error out(_factory->_instance->initializationData().logger);
 	out << "std::exception in thread per incoming connection factory:\n" << _factory->toString() << ex.what();
     }
     catch(...)
     {
-	Error out(_factory->_instance->logger());
+	Error out(_factory->_instance->initializationData().logger);
 	out << "unknown exception in thread per incoming connection factory:\n" << _factory->toString();
     }