diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-09-16 12:52:29 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-09-16 12:52:29 +0200 |
| commit | 7e63d34a0c182b88b7855972bb037dbf6e03c2c3 (patch) | |
| tree | 5617b1ac9ae7c30510decfa960c74a9b0785c590 /cpp/src | |
| parent | Fixed for timeout bugs (ICE-7358, ICE-7243, Ice-7227) (diff) | |
| download | ice-7e63d34a0c182b88b7855972bb037dbf6e03c2c3.tar.bz2 ice-7e63d34a0c182b88b7855972bb037dbf6e03c2c3.tar.xz ice-7e63d34a0c182b88b7855972bb037dbf6e03c2c3.zip | |
Fixed ICE-7357 - Java hang in nested demo
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Incoming.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp index 1066773110e..7b5e6741660 100644 --- a/cpp/src/Ice/Incoming.cpp +++ b/cpp/src/Ice/Incoming.cpp @@ -229,15 +229,22 @@ IceInternal::IncomingBase::warning(const Exception& ex) const if(_current.con) { - for(Ice::ConnectionInfoPtr connInfo = _current.con->getInfo(); connInfo; connInfo = connInfo->underlying) + try { - Ice::IPConnectionInfoPtr ipConnInfo = ICE_DYNAMIC_CAST(Ice::IPConnectionInfo, connInfo); - if(ipConnInfo) + for(Ice::ConnectionInfoPtr connInfo = _current.con->getInfo(); connInfo; connInfo = connInfo->underlying) { - out << "\nremote host: " << ipConnInfo->remoteAddress << " remote port: " << ipConnInfo->remotePort; - break; + Ice::IPConnectionInfoPtr ipConnInfo = ICE_DYNAMIC_CAST(Ice::IPConnectionInfo, connInfo); + if(ipConnInfo) + { + out << "\nremote host: " << ipConnInfo->remoteAddress << " remote port: " << ipConnInfo->remotePort; + break; + } } } + catch(const Ice::LocalException&) + { + // Ignore. + } } } |