Fixed ICE-5150: assert in OutgoingAsync._finished, fixed CHANGES

1 files changed, 27 insertions, 0 deletions

diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index d08c104e2db..d9033a0f76a 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -841,6 +841,9 @@ public:
         catch(const Ice::UnknownLocalException&)
         {
         }
+        catch(const Ice::OperationNotExistException&)
+        {
+        }
         catch(...)
         {
             test(false);
@@ -1416,6 +1419,21 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     {
         test(false);
     }
+    try
+    {
+        thrower->throwLocalExceptionIdempotent();
+        test(false);
+    }
+    catch(const Ice::UnknownLocalException&)
+    {
+    }
+    catch(const Ice::OperationNotExistException&)
+    {
+    }
+    catch(...)
+    {
+        test(false);
+    }
 
     cout << "ok" << endl;
 
@@ -1770,6 +1788,15 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
             cb->check();
         }
 
+        {
+            CallbackPtr cb = new Callback;
+            Callback_Thrower_throwLocalExceptionIdempotentPtr callback = 
+                newCallback_Thrower_throwLocalExceptionIdempotent(cb, &Callback::response, 
+                                                                  &Callback::exception_LocalException);
+            thrower->begin_throwLocalExceptionIdempotent(callback);
+            cb->check();
+        }
+
         cout << "ok" << endl;
 
         cout << "catching unknown non-Ice exception with new AMI mapping... " << flush;