diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-06-28 17:44:15 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-06-28 17:44:15 +0200 |
| commit | 97dcbc0c36cef9ef6b0dceb300dd3777d7f625a2 (patch) | |
| tree | 68c959ebb69a63edd78bdc655daefcb8deba87a7 /cpp/src/Ice/ConnectionI.cpp | |
| parent | Fix to help investigating ICE-7198 (diff) | |
| download | ice-97dcbc0c36cef9ef6b0dceb300dd3777d7f625a2.tar.bz2 ice-97dcbc0c36cef9ef6b0dceb300dd3777d7f625a2.tar.xz ice-97dcbc0c36cef9ef6b0dceb300dd3777d7f625a2.zip | |
Fixed NPE in Java/IceSSL implementation
Diffstat (limited to 'cpp/src/Ice/ConnectionI.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index 2abec6e1a82..d75a0dd2222 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -1981,7 +1981,15 @@ Ice::ConnectionI::finish(bool close) if(close) { - _transceiver->close(); + try + { + _transceiver->close(); + } + catch(const Ice::LocalException& ex) + { + Error out(_logger); + out << "unexpected connection exception:\n" << ex << '\n' << _desc; + } } if(_startCallback) |