diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-10-10 12:03:07 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-10-10 12:03:07 +0200 |
| commit | 570455a381e6620f8ddfcca448559d3fa545ba38 (patch) | |
| tree | fe3fa45e6a643b473d9370babff6224b1a9d4dcb /cpp/src/Ice/Exception.cpp | |
| parent | Fixed ICE-5726: provide deprecated public StringConverterPlugin (diff) | |
| download | ice-570455a381e6620f8ddfcca448559d3fa545ba38.tar.bz2 ice-570455a381e6620f8ddfcca448559d3fa545ba38.tar.xz ice-570455a381e6620f8ddfcca448559d3fa545ba38.zip | |
Fixed invocation timeouts/interrupt issues, addded AsyncResult.cancel()
Diffstat (limited to 'cpp/src/Ice/Exception.cpp')
| -rw-r--r-- | cpp/src/Ice/Exception.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp index a8bb8c6f81a..e5a3aed5b9f 100644 --- a/cpp/src/Ice/Exception.cpp +++ b/cpp/src/Ice/Exception.cpp @@ -502,6 +502,13 @@ Ice::InvocationTimeoutException::ice_print(ostream& out) const } void +Ice::InvocationCanceledException::ice_print(ostream& out) const +{ + Exception::ice_print(out); + out << ":\ninvocation canceled"; +} + +void Ice::ProtocolException::ice_print(ostream& out) const { Exception::ice_print(out); |