summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Exception.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2014-07-10 16:51:36 -0400
committerBernard Normier <bernard@zeroc.com>2014-07-10 16:51:36 -0400
commit7f767642e79e2775a958781011f13e3d1710c7bd (patch)
treefdb3eb1f826305d0bf3dd659d70c3930001f80c0 /cpp/src/Ice/Exception.cpp
parentICE-5573 - .NET TimeoutException ignores Dispatcher (diff)
downloadice-7f767642e79e2775a958781011f13e3d1710c7bd.tar.bz2
ice-7f767642e79e2775a958781011f13e3d1710c7bd.tar.xz
ice-7f767642e79e2775a958781011f13e3d1710c7bd.zip
Fixed ICE-5379, Object Adapter should reject null servant, in C++, Java, C# and JS
Diffstat (limited to 'cpp/src/Ice/Exception.cpp')
-rw-r--r--cpp/src/Ice/Exception.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index 0fd53c3cae2..af4e44e6087 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -323,6 +323,14 @@ Ice::IllegalIdentityException::ice_print(ostream& out) const
out << "'";
}
+void
+Ice::IllegalServantException::ice_print(ostream& out) const
+{
+ Exception::ice_print(out);
+ out << ":\nillegal servant: `" << reason << "'";
+}
+
+
static void
printFailedRequestData(ostream& out, const RequestFailedException& ex)
{