Fixed ICE-7954 - bug in Object::ice_dispatch

2 files changed, 25 insertions, 27 deletions

diff --git a/cpp/test/Ice/interceptor/AMDInterceptorI.cpp b/cpp/test/Ice/interceptor/AMDInterceptorI.cpp
index cfd3490288c..05fc80709e1 100644
--- a/cpp/test/Ice/interceptor/AMDInterceptorI.cpp
+++ b/cpp/test/Ice/interceptor/AMDInterceptorI.cpp
@@ -30,6 +30,9 @@ AMDInterceptorI::dispatch(Ice::Request& request)
     class CallbackI : public Ice::DispatchInterceptorAsyncCallback
     {
     public:
+        CallbackI() : _count(0)
+        {
+        }
 
         virtual bool response()
         {
@@ -38,6 +41,7 @@ AMDInterceptorI::dispatch(Ice::Request& request)
 
         virtual bool exception(const std::exception& ex)
         {
+            test(_count++ == 0); // Ensure it's only called once
             test(dynamic_cast<const Test::RetryException*>(&ex) != 0);
             return false;
         }
@@ -50,8 +54,11 @@ AMDInterceptorI::dispatch(Ice::Request& request)
             test(false);
             return false;
         }
+
+    private:
+
+        int _count;
     };
-    Ice::DispatchInterceptorAsyncCallbackPtr cb = ICE_MAKE_SHARED(CallbackI);
 #endif
 
     Ice::Current& current = const_cast<Ice::Current&>(request.getCurrent());
@@ -61,34 +68,25 @@ AMDInterceptorI::dispatch(Ice::Request& request)
     {
         for(int i = 0; i < 10; ++i)
         {
-            try
-            {
 #ifdef ICE_CPP11_MAPPING
-                _lastStatus =  _servant->ice_dispatch(request, nullptr, [](exception_ptr ex) {
-                    try
-                    {
-                        rethrow_exception(ex);
-                    }
-                    catch(Test::RetryException&)
-                    {
-                    }
-                    catch(...)
-                    {
-                        test(false);
-                    }
-                    return false;
-                });
+            _lastStatus =  _servant->ice_dispatch(request, nullptr, [](exception_ptr ex) {
+                try
+                {
+                    rethrow_exception(ex);
+                }
+                catch(Test::RetryException&)
+                {
+                }
+                catch(...)
+                {
+                    test(false);
+                }
+                return false;
+            });
 #else
-                _lastStatus =  _servant->ice_dispatch(request, cb);
+            _lastStatus =  _servant->ice_dispatch(request, new CallbackI());
 #endif
-                test(_lastStatus);
-            }
-            catch(const Test::RetryException&)
-            {
-                //
-                // Expected, retry
-                //
-            }
+            test(!_lastStatus);
         }
 
         current.ctx["retry"] = "no";
diff --git a/cpp/test/Ice/interceptor/MyObjectI.cpp b/cpp/test/Ice/interceptor/MyObjectI.cpp
index a452568dbcb..02e009fd51e 100644
--- a/cpp/test/Ice/interceptor/MyObjectI.cpp
+++ b/cpp/test/Ice/interceptor/MyObjectI.cpp
@@ -258,7 +258,7 @@ MyObjectI::amdAddWithRetry_async(const Test::AMD_MyObject_amdAddWithRetryPtr& cb
 
     if(p == current.ctx.end() || p->second != "no")
     {
-        throw Test::RetryException(__FILE__, __LINE__);
+        cb->ice_exception(Test::RetryException(__FILE__, __LINE__));
     }
 }