1 files changed, 47 insertions, 61 deletions

diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index 19b2102d4dd..1aafeacb5f5 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -20,144 +20,116 @@ Ice::LocalException::LocalException(const char* file, int line) :
 {
 }
 
-Ice::LocalException::LocalException(const LocalException& ex) :
-    Exception(ex)
-{
-}
-
-LocalException&
-Ice::LocalException::operator=(const LocalException& ex)
-{
-    Exception::operator=(ex);
-    return *this;
-}
-
-Ice::UserException::UserException()
-{
-}
-
-Ice::UserException::UserException(const UserException& ex) :
-    Exception(ex)
-{
-}
-
-UserException&
-Ice::UserException::operator=(const UserException& ex)
-{
-    Exception::operator=(ex);
-    return *this;
-}
-
 ostream&
 IceUtil::printException(ostream& out, const UnknownLocalException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": unknown local exception";
+    return out << ":\nunknown local exception";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const UnknownUserException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": unknown user exception";
+    return out << ":\nunknown user exception";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const UnknownException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": unknown C++ exception";
+    return out << ":\nunknown C++ exception";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const VersionMismatchException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": Ice library version mismatch";
+    return out << ":\nIce library version mismatch";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const CommunicatorDestroyedException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": communicator object destroyed";
+    return out << ":\ncommunicator object destroyed";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const ObjectAdapterDeactivatedException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": object adapter deactivated";
+    return out << ":\nobject adapter deactivated";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const NoEndpointException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": no suitable endpoint available";
+    return out << ":\nno suitable endpoint available";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const EndpointParseException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": error while parsing endpoint";
+    return out << ":\nerror while parsing endpoint";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const ReferenceParseException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": error while parsing reference";
+    return out << ":\nerror while parsing reference";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const ReferenceIdentityException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": reference identity mismatch in location forward";
+    return out << ":\nreference identity mismatch in location forward";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const ObjectNotExistException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": object does not exist";
+    return out << ":\nobject does not exist";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const OperationNotExistException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": operation does not exist";
+    return out << ":\noperation does not exist";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const SystemException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": system exception: " << errorToString(ex.error);
+    return out << ":\nsystem exception: " << errorToString(ex.error);
 }
 
 ostream&
 IceUtil::printException(ostream& out, const SocketException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": system exception: " << errorToString(ex.error);
+    return out << ":\nsystem exception: " << errorToString(ex.error);
 }
 
 ostream&
 IceUtil::printException(ostream& out, const ConnectFailedException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": connect failed: " << errorToString(ex.error);
+    return out << ":\nconnect failed: " << errorToString(ex.error);
 }
 
 ostream&
 IceUtil::printException(ostream& out, const ConnectionLostException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    out << ": connection lost: ";
+    out << ":\nconnection lost: ";
     if (ex.error == 0)
     {
 	return out << "recv() returned zero";
@@ -172,117 +144,131 @@ ostream&
 IceUtil::printException(ostream& out, const DNSException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": DNS error: " + errorToStringDNS(ex.error);
+    return out << ":\nDNS error: " + errorToStringDNS(ex.error);
 }
 
 ostream&
 IceUtil::printException(ostream& out, const TimeoutException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": timeout while sending or receiving data";
+    return out << ":\ntimeout while sending or receiving data";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const ConnectTimeoutException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": timeout while establishing a connection";
+    return out << ":\ntimeout while establishing a connection";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const ProtocolException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": unknown protocol exception";
+    return out << ":\nunknown protocol exception";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const UnmarshalOutOfBoundsException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": protocol error: out of bounds during unmarshaling";
+    return out << ":\nprotocol error: out of bounds during unmarshaling";
+}
+
+ostream&
+IceUtil::printException(ostream& out, const NoServantFactoryException& ex)
+{
+    IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
+    return out << ":\nprotocol error: no servant factory found for servant with operations";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const ServantUnmarshalException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": protocol error: no suitable servant factory available";
+    return out << ":\nprotocol error: servant type unknown or doesn't match signature";
+}
+
+ostream&
+IceUtil::printException(ostream& out, const UserExceptionUnmarshalException& ex)
+{
+    IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
+    return out << ":\nprotocol error: exception type unknown or doesn't match signature";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const StringEncodingException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": protocol error: string encoding error";
+    return out << ":\nprotocol error: string encoding error";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const MemoryLimitException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": protocol error: memory limit exceeded";
+    return out << ":\nprotocol error: memory limit exceeded";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const EncapsulationException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": protocol error: illegal encapsulation";
+    return out << ":\nprotocol error: illegal encapsulation";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const UnsupportedProtocolException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": protocol error: unsupported protocol version";
+    return out << ":\nprotocol error: unsupported protocol version";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const UnsupportedEncodingException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": protocol error: unsupported encoding version";
+    return out << ":\nprotocol error: unsupported encoding version";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const InvalidMessageException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": protocol error: invalid message type";
+    return out << ":\nprotocol error: invalid message type";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const UnknownMessageException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": protocol error: unknown message type";
+    return out << ":\nprotocol error: unknown message type";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const UnknownRequestIdException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": protocol error: unknown request id";
+    return out << ":\nprotocol error: unknown request id";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const UnknownReplyStatusException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": protocol error: unknown reply status";
+    return out << ":\nprotocol error: unknown reply status";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const CloseConnectionException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": protocol error: connection closed by server";
+    return out << ":\nprotocol error: connection closed by server";
 }
 
 ostream&
 IceUtil::printException(ostream& out, const AbortBatchRequestException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": protocol error: batch request was aborted";
+    return out << ":\nprotocol error: batch request was aborted";
 }