catch UnknownExceptions explicitly

2 files changed, 117 insertions, 0 deletions

diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index bf23c0f87fd..6d9a7d54490 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -271,6 +271,78 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
 	__finishInvoke();
 	return;
     }
+    catch(const UnknownLocalException& ex)
+    {
+	_is.endReadEncaps();
+
+	if(_os.instance()->properties()->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
+	{
+	    __warning(ex);
+	}
+
+	if(_response)
+	{
+	    _os.endWriteEncaps();
+	    _os.b.resize(headerSize + 4); // Dispatch status position.
+	    _os.write(static_cast<Byte>(DispatchUnknownLocalException));
+	    _os.write(ex.unknown);
+	}
+
+	//
+	// Must be called last, so that if an exception is raised,
+	// this function is definitely *not* called.
+	//
+	__finishInvoke();
+	return;
+    }
+    catch(const UnknownUserException& ex)
+    {
+	_is.endReadEncaps();
+
+	if(_os.instance()->properties()->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
+	{
+	    __warning(ex);
+	}
+
+	if(_response)
+	{
+	    _os.endWriteEncaps();
+	    _os.b.resize(headerSize + 4); // Dispatch status position.
+	    _os.write(static_cast<Byte>(DispatchUnknownUserException));
+	    _os.write(ex.unknown);
+	}
+
+	//
+	// Must be called last, so that if an exception is raised,
+	// this function is definitely *not* called.
+	//
+	__finishInvoke();
+	return;
+    }
+    catch(const UnknownException& ex)
+    {
+	_is.endReadEncaps();
+
+	if(_os.instance()->properties()->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
+	{
+	    __warning(ex);
+	}
+
+	if(_response)
+	{
+	    _os.endWriteEncaps();
+	    _os.b.resize(headerSize + 4); // Dispatch status position.
+	    _os.write(static_cast<Byte>(DispatchUnknownException));
+	    _os.write(ex.unknown);
+	}
+
+	//
+	// Must be called last, so that if an exception is raised,
+	// this function is definitely *not* called.
+	//
+	__finishInvoke();
+	return;
+    }
     catch(const LocalException& ex)
     {
 	_is.endReadEncaps();
diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp
index 996dbd3c1c2..5c049a1753d 100644
--- a/cpp/src/Ice/IncomingAsync.cpp
+++ b/cpp/src/Ice/IncomingAsync.cpp
@@ -133,6 +133,51 @@ IceInternal::IncomingAsync::__exception(const Exception& exc)
 	    _os.write(ex.operation);
 	}
     }
+    catch(const UnknownLocalException& ex)
+    {
+	if(_os.instance()->properties()->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
+	{
+	    __warning(ex);
+	}
+
+	if(_response)
+	{
+	    _os.endWriteEncaps();
+	    _os.b.resize(headerSize + 4); // Dispatch status position.
+	    _os.write(static_cast<Byte>(DispatchUnknownLocalException));
+	    _os.write(ex.unknown);
+	}
+    }
+    catch(const UnknownUserException& ex)
+    {
+	if(_os.instance()->properties()->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
+	{
+	    __warning(ex);
+	}
+
+	if(_response)
+	{
+	    _os.endWriteEncaps();
+	    _os.b.resize(headerSize + 4); // Dispatch status position.
+	    _os.write(static_cast<Byte>(DispatchUnknownUserException));
+	    _os.write(ex.unknown);
+	}
+    }
+    catch(const UnknownException& ex)
+    {
+	if(_os.instance()->properties()->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
+	{
+	    __warning(ex);
+	}
+
+	if(_response)
+	{
+	    _os.endWriteEncaps();
+	    _os.b.resize(headerSize + 4); // Dispatch status position.
+	    _os.write(static_cast<Byte>(DispatchUnknownException));
+	    _os.write(ex.unknown);
+	}
+    }
     catch(const LocalException& ex)
     {
 	if(_os.instance()->properties()->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)