diff options
| author | Mark Spruiell <mes@zeroc.com> | 2017-01-30 13:45:21 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2017-01-30 13:45:21 -0800 |
| commit | 61270a10f980933cf582edb766f10c8ac6d86e8a (patch) | |
| tree | 45ab4a7c2986954054fce613bc3c8f7967e7951e /cpp/src/Ice/Exception.cpp | |
| parent | Fix slice2cpp build failure (diff) | |
| download | ice-61270a10f980933cf582edb766f10c8ac6d86e8a.tar.bz2 ice-61270a10f980933cf582edb766f10c8ac6d86e8a.tar.xz ice-61270a10f980933cf582edb766f10c8ac6d86e8a.zip | |
merging IceBridge into master
Diffstat (limited to 'cpp/src/Ice/Exception.cpp')
| -rw-r--r-- | cpp/src/Ice/Exception.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp index 4ac7d66cdd3..a20c564101e 100644 --- a/cpp/src/Ice/Exception.cpp +++ b/cpp/src/Ice/Exception.cpp @@ -632,14 +632,10 @@ Ice::CloseConnectionException::ice_print(ostream& out) const } void -Ice::ForcedCloseConnectionException::ice_print(ostream& out) const +Ice::ConnectionManuallyClosedException::ice_print(ostream& out) const { Exception::ice_print(out); - out << ":\nprotocol error: connection forcefully closed"; - if(!reason.empty()) - { - out << ":\n" << reason; - } + out << ":\nprotocol error: connection manually closed (" << (graceful ? "gracefully" : "forcefully") << ")"; } void |