diff options
| author | Jose <jose@zeroc.com> | 2017-09-20 11:05:13 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-09-20 11:05:13 +0200 |
| commit | 7f0816001e085f482f8f9a34b7f8e06435907510 (patch) | |
| tree | 46807f18b840e1c9816cd9b4aac001c8078d8bce /cpp/src/IceGrid/Topics.cpp | |
| parent | Fixed Ice/acm Java7 build failure (diff) | |
| download | ice-7f0816001e085f482f8f9a34b7f8e06435907510.tar.bz2 ice-7f0816001e085f482f8f9a34b7f8e06435907510.tar.xz ice-7f0816001e085f482f8f9a34b7f8e06435907510.zip | |
Clean C++ exception code to only throw exception types
- Update C++ code to only throw types derived from
C++ exception
- Update C++ code to use one-shot constructors to
create the exceptions
Fix bug ICE-7892
Diffstat (limited to 'cpp/src/IceGrid/Topics.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Topics.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cpp/src/IceGrid/Topics.cpp b/cpp/src/IceGrid/Topics.cpp index 568e753f16d..1ec50249a0c 100644 --- a/cpp/src/IceGrid/Topics.cpp +++ b/cpp/src/IceGrid/Topics.cpp @@ -724,6 +724,12 @@ ApplicationObserverTopic::applicationUpdated(Ice::Long dbSerial, const Applicati out << "unexpected exception while instantiating application `" << info.descriptor.name << "':\n" << ex.reason; assert(false); } + catch(const std::exception& ex) + { + Ice::Error out(_logger); + out << "unexpected exception while instantiating application `" << info.descriptor.name << "':\n" << ex.what(); + assert(false); + } catch(const std::string& msg) { Ice::Error out(_logger); |