Fixed dispatch interceptor test threading issue, fixes #446

1 files changed, 5 insertions, 2 deletions

diff --git a/cpp/test/Ice/interceptor/Client.cpp b/cpp/test/Ice/interceptor/Client.cpp
index d47dc7abc22..191215fd59d 100644
--- a/cpp/test/Ice/interceptor/Client.cpp
+++ b/cpp/test/Ice/interceptor/Client.cpp
@@ -285,10 +285,13 @@ Client::testInterceptorExceptions(const Test::MyObjectPrxPtr& prx)
             batch->ice_ping(ctx);
             batch->ice_ping();
             batch->ice_flushBatchRequests();
+
+            // Force the last batch request to be dispatched by the server thread using invocation timeouts
+            // This is required to preven threading issue with the test interceptor implementation which
+            // isn't thread safe
+            prx->ice_invocationTimeout(10000)->ice_ping();
         }
     }
-    // Force the last batch request to be dispatched by the server thread using invocation timeouts
-    prx->ice_invocationTimeout(10000)->ice_ping();
 }
 
 DEFINE_TEST(Client)