summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/InstrumentationI.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-11-22 10:45:10 +0100
committerBenoit Foucher <benoit@zeroc.com>2012-11-22 10:45:10 +0100
commitb15b703032bae115456552a9fb2d30c00b71f540 (patch)
treedd3481f81b63baca29526a333cffd8af0160b5db /cpp/src/Ice/InstrumentationI.cpp
parentFixed bug 4976: optional and string literals (diff)
downloadice-b15b703032bae115456552a9fb2d30c00b71f540.tar.bz2
ice-b15b703032bae115456552a9fb2d30c00b71f540.tar.xz
ice-b15b703032bae115456552a9fb2d30c00b71f540.zip
Fixed ICE-4979: test failures with --mx enabled
Diffstat (limited to 'cpp/src/Ice/InstrumentationI.cpp')
-rw-r--r--cpp/src/Ice/InstrumentationI.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp
index c9f17cdd662..319d0a2842e 100644
--- a/cpp/src/Ice/InstrumentationI.cpp
+++ b/cpp/src/Ice/InstrumentationI.cpp
@@ -408,8 +408,9 @@ public:
{
os << _proxy->ice_endpoints(Ice::EndpointSeq()) << " [" << _operation << ']';
}
- catch(const FixedProxyException&)
+ catch(const Exception&)
{
+ // Either a fixed proxy or the the communicator is destroyed.
os << _proxy->ice_getCommunicator()->identityToString(_proxy->ice_getIdentity());
os << " [" << _operation << ']';
}