diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-09-16 15:15:20 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-09-16 15:15:20 +0200 |
| commit | 682c207665523731c3f64fcd83551a846dc11477 (patch) | |
| tree | b8e88267710c4d48d2c5b848b86a8e1bbd758c62 /cpp | |
| parent | Removed double About on OS X (diff) | |
| download | ice-682c207665523731c3f64fcd83551a846dc11477.tar.bz2 ice-682c207665523731c3f64fcd83551a846dc11477.tar.xz ice-682c207665523731c3f64fcd83551a846dc11477.zip | |
Fix for ICE-7357 - catch exceptions raised by connection getInfo
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Ice/Incoming.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp index 3e808ac6f89..fb94e36c717 100644 --- a/cpp/src/Ice/Incoming.cpp +++ b/cpp/src/Ice/Incoming.cpp @@ -178,11 +178,18 @@ IceInternal::IncomingBase::__warning(const Exception& ex) const if(_current.con) { - Ice::ConnectionInfoPtr connInfo = _current.con->getInfo(); - Ice::IPConnectionInfoPtr ipConnInfo = Ice::IPConnectionInfoPtr::dynamicCast(connInfo); - if(ipConnInfo) + try { - out << "\nremote host: " << ipConnInfo->remoteAddress << " remote port: " << ipConnInfo->remotePort; + Ice::ConnectionInfoPtr connInfo = _current.con->getInfo(); + Ice::IPConnectionInfoPtr ipConnInfo = Ice::IPConnectionInfoPtr::dynamicCast(connInfo); + if(ipConnInfo) + { + out << "\nremote host: " << ipConnInfo->remoteAddress << " remote port: " << ipConnInfo->remotePort; + } + } + catch(const Ice::LocalException&) + { + // Ignore. } } } |