Fixed dispatch interceptor test threading issue, fixes #446

1 files changed, 5 insertions, 2 deletions

diff --git a/csharp/test/Ice/interceptor/Client.cs b/csharp/test/Ice/interceptor/Client.cs
index 6c8b59cfd52..2345891a324 100644
--- a/csharp/test/Ice/interceptor/Client.cs
+++ b/csharp/test/Ice/interceptor/Client.cs
@@ -257,10 +257,13 @@ namespace Ice
                         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();
             }
         }
     }