Fixed dispatch interceptor test threading issue, fixes #446

1 files changed, 5 insertions, 2 deletions

diff --git a/java/test/src/main/java/test/Ice/interceptor/Client.java b/java/test/src/main/java/test/Ice/interceptor/Client.java
index b45f9eec748..dafae39f792 100644
--- a/java/test/src/main/java/test/Ice/interceptor/Client.java
+++ b/java/test/src/main/java/test/Ice/interceptor/Client.java
@@ -258,9 +258,12 @@ public class Client extends test.TestHelper
                 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();
     }
 }