diff options
| author | Jose <jose@zeroc.com> | 2012-07-17 16:53:05 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-07-17 16:53:05 +0200 |
| commit | 9e833a51504b14ac852863dcad59a51e6025ce79 (patch) | |
| tree | 6ca0297b6e6575fe4c6b2d48b606fef8132b9e5a /cpp/src/Ice/ConnectionMonitor.cpp | |
| parent | implementing optional params in Java (diff) | |
| parent | WinRT support (diff) | |
| download | ice-9e833a51504b14ac852863dcad59a51e6025ce79.tar.bz2 ice-9e833a51504b14ac852863dcad59a51e6025ce79.tar.xz ice-9e833a51504b14ac852863dcad59a51e6025ce79.zip | |
Merge branch 'master' into encoding11
Conflicts:
CHANGES
cpp/src/Ice/EndpointI.cpp
cpp/src/Ice/TcpConnector.cpp
cpp/src/Ice/TcpConnector.h
cpp/src/Ice/UdpConnector.cpp
cpp/src/Ice/UdpConnector.h
Diffstat (limited to 'cpp/src/Ice/ConnectionMonitor.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionMonitor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/ConnectionMonitor.cpp b/cpp/src/Ice/ConnectionMonitor.cpp index 49e3ab2ba59..7d9e43c7a7c 100644 --- a/cpp/src/Ice/ConnectionMonitor.cpp +++ b/cpp/src/Ice/ConnectionMonitor.cpp @@ -128,7 +128,7 @@ IceInternal::ConnectionMonitor::runTimerTask() { (*p)->monitor(now); } - catch(const Exception& ex) + catch(const exception& ex) { IceUtil::Mutex::Lock sync(*this); if(!_instance) @@ -137,7 +137,7 @@ IceInternal::ConnectionMonitor::runTimerTask() } Error out(_instance->initializationData().logger); - out << "exception in connection monitor:\n" << ex; + out << "exception in connection monitor:\n" << ex.what(); } catch(...) { |