summaryrefslogtreecommitdiff
path: root/java-compat
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2019-07-16 18:52:11 +0200
committerBenoit Foucher <benoit@zeroc.com>2019-07-16 18:54:40 +0200
commit26725c376f9e674a22dc3ec2a18ea1e2a461a790 (patch)
treec7b1e9cdfe02317bf73ab9db5eb3c8fcfad2cf3d /java-compat
parentAllow to test python mapping with v141 (Visual Studio 2017) (diff)
downloadice-26725c376f9e674a22dc3ec2a18ea1e2a461a790.tar.bz2
ice-26725c376f9e674a22dc3ec2a18ea1e2a461a790.tar.xz
ice-26725c376f9e674a22dc3ec2a18ea1e2a461a790.zip
Fixed dispatch interceptor test threading issue, fixes #446
Diffstat (limited to 'java-compat')
-rw-r--r--java-compat/test/src/main/java/test/Ice/interceptor/Client.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/java-compat/test/src/main/java/test/Ice/interceptor/Client.java b/java-compat/test/src/main/java/test/Ice/interceptor/Client.java
index a4e5c436947..0661f9e2117 100644
--- a/java-compat/test/src/main/java/test/Ice/interceptor/Client.java
+++ b/java-compat/test/src/main/java/test/Ice/interceptor/Client.java
@@ -271,9 +271,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();
}
}