diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-09-23 10:54:29 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-09-23 10:54:29 -0230 |
| commit | 0e5a650f2b2085c823c4529fcf55b85706c3c1ee (patch) | |
| tree | 35d1f338e25e5224681bfa5c6e52a8358bd11b01 /cpp/src/Ice/ConnectionFactory.cpp | |
| parent | ICE-5670 - interrupt test failure (diff) | |
| download | ice-0e5a650f2b2085c823c4529fcf55b85706c3c1ee.tar.bz2 ice-0e5a650f2b2085c823c4529fcf55b85706c3c1ee.tar.xz ice-0e5a650f2b2085c823c4529fcf55b85706c3c1ee.zip | |
Minor change to Udptransceiver to ensure proper tracing on failure
Diffstat (limited to 'cpp/src/Ice/ConnectionFactory.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionFactory.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp index 44401760b4f..f859ac3fa58 100644 --- a/cpp/src/Ice/ConnectionFactory.cpp +++ b/cpp/src/Ice/ConnectionFactory.cpp @@ -1678,7 +1678,7 @@ IceInternal::IncomingConnectionFactory::initialize(const string& oaName) { try { - closeAcceptor(); + closeAcceptor(false); } catch(const Ice::LocalException&) { @@ -1768,7 +1768,7 @@ IceInternal::IncomingConnectionFactory::setState(State state) // if(_acceptor) { - closeAcceptor(); + closeAcceptor(true); } #endif for_each(_connections.begin(), _connections.end(), @@ -1782,7 +1782,7 @@ IceInternal::IncomingConnectionFactory::setState(State state) #if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT) if(_acceptor) { - closeAcceptor(); + closeAcceptor(true); } #endif break; @@ -1794,9 +1794,9 @@ IceInternal::IncomingConnectionFactory::setState(State state) } void -IceInternal::IncomingConnectionFactory::closeAcceptor() +IceInternal::IncomingConnectionFactory::closeAcceptor(bool trace) { - if(_instance->traceLevels()->network >= 1) + if(trace && _instance->traceLevels()->network >= 1) { Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat); out << "stopping to accept " << _endpoint->protocol() << " connections at " << _acceptor->toString(); |