more AMD exception fixes

1 files changed, 16 insertions, 1 deletions

diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index 14a7e935296..ac3448c8b7a 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -437,6 +437,21 @@ Ice::BlobjectAsync::__dispatch(Incoming& in, const Current& current)
     Int sz = in.is()->getReadEncapsSize();
     in.is()->readBlob(inParams, sz);
     AMD_Object_ice_invokePtr cb = new ::IceAsync::Ice::AMD_Object_ice_invoke(in);
-    ice_invoke_async(cb, inParams, current);
+    try
+    {
+	ice_invoke_async(cb, inParams, current);
+    }
+    catch(const Exception& ex)
+    {
+	cb->ice_exception(ex);
+    }
+    catch(const ::std::exception& ex)
+    {
+	cb->ice_exception(ex);
+    }
+    catch(...)
+    {
+	cb->ice_exception();
+    }
     return ::IceInternal::DispatchOK;
 }